Get rid of {Enable|Disable|ChromeCaptivePortalDetector flag.
BUG=316597 TEST=none Review URL: https://codereview.chromium.org/66713002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233944 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
@ -707,9 +707,6 @@ Chromium is unable to recover your settings.
|
|||||||
<message name="IDS_FLAGS_RELAUNCH_NOTICE" desc="Notifies the user that he needs to restart Chromium OS. Shown next to a button that says 'Restart Now'.">
|
<message name="IDS_FLAGS_RELAUNCH_NOTICE" desc="Notifies the user that he needs to restart Chromium OS. Shown next to a button that says 'Restart Now'.">
|
||||||
Your changes will take effect the next time you restart your device.
|
Your changes will take effect the next time you restart your device.
|
||||||
</message>
|
</message>
|
||||||
<message name="IDS_FLAGS_CHROME_CAPTIVE_PORTAL_DETECTOR" desc="Description for the option of Captive Portal detector.">
|
|
||||||
Chromium Captive Portal detector
|
|
||||||
</message>
|
|
||||||
</if>
|
</if>
|
||||||
|
|
||||||
<!-- Obsolete System info bar -->
|
<!-- Obsolete System info bar -->
|
||||||
|
@ -6605,15 +6605,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
|
|||||||
<message name="IDS_FLAGS_DISABLE_BOOT_ANIMATION_DESCRIPTION" desc="Description for the flag to disable wallpaper boot animation (except for OOBE).">
|
<message name="IDS_FLAGS_DISABLE_BOOT_ANIMATION_DESCRIPTION" desc="Description for the flag to disable wallpaper boot animation (except for OOBE).">
|
||||||
Disables wallpaper boot animation (except for OOBE case).
|
Disables wallpaper boot animation (except for OOBE case).
|
||||||
</message>
|
</message>
|
||||||
<message name="IDS_FLAGS_CAPTIVE_PORTAL_DETECTOR_NAME" desc="Name for the flag to set to enable Chrome Captive Portal detector.">
|
|
||||||
Captive Portal detector.
|
|
||||||
</message>
|
|
||||||
<message name="IDS_FLAGS_CAPTIVE_PORTAL_DETECTOR_DESCRIPTION" desc="Description for the flag to set to enable Chrome's Captive Portal Detector on the sign-in screen.">
|
|
||||||
Change Captive Portal detector.
|
|
||||||
</message>
|
|
||||||
<message name="IDS_FLAGS_SHILL_CAPTIVE_PORTAL_DETECTOR" desc="Description for the option of Captive Portal detector.">
|
|
||||||
Shill Captive Portal detector
|
|
||||||
</message>
|
|
||||||
<message name="IDS_FLAGS_ENABLE_STICKY_KEYS_NAME" desc="Name for the flag to enable sticky keys.">
|
<message name="IDS_FLAGS_ENABLE_STICKY_KEYS_NAME" desc="Name for the flag to enable sticky keys.">
|
||||||
Enable sticky keys.
|
Enable sticky keys.
|
||||||
</message>
|
</message>
|
||||||
|
@ -631,9 +631,6 @@ Google Chrome is unable to recover your settings.
|
|||||||
<message name="IDS_FLAGS_RELAUNCH_NOTICE" desc="Notifies the user that he needs to restart Chrome OS. Shown next to a button that says 'Restart Now'.">
|
<message name="IDS_FLAGS_RELAUNCH_NOTICE" desc="Notifies the user that he needs to restart Chrome OS. Shown next to a button that says 'Restart Now'.">
|
||||||
Your changes will take effect the next time you restart your device.
|
Your changes will take effect the next time you restart your device.
|
||||||
</message>
|
</message>
|
||||||
<message name="IDS_FLAGS_CHROME_CAPTIVE_PORTAL_DETECTOR" desc="Description for the option of Captive Portal detector.">
|
|
||||||
Chrome Captive Portal detector
|
|
||||||
</message>
|
|
||||||
</if>
|
</if>
|
||||||
|
|
||||||
<!-- Obsolete System info bar -->
|
<!-- Obsolete System info bar -->
|
||||||
|
@ -188,18 +188,6 @@ const Experiment::Choice kNaClDebugMaskChoices[] = {
|
|||||||
switches::kNaClDebugMask, "*://*/*debug.nmf" }
|
switches::kNaClDebugMask, "*://*/*debug.nmf" }
|
||||||
};
|
};
|
||||||
|
|
||||||
#if defined(OS_CHROMEOS)
|
|
||||||
|
|
||||||
const Experiment::Choice kChromeCaptivePortalDetectionChoices[] = {
|
|
||||||
{ IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
|
|
||||||
{ IDS_FLAGS_CHROME_CAPTIVE_PORTAL_DETECTOR,
|
|
||||||
chromeos::switches::kEnableChromeCaptivePortalDetector, "" },
|
|
||||||
{ IDS_FLAGS_SHILL_CAPTIVE_PORTAL_DETECTOR,
|
|
||||||
chromeos::switches::kDisableChromeCaptivePortalDetector, "" }
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
const Experiment::Choice kImplSidePaintingChoices[] = {
|
const Experiment::Choice kImplSidePaintingChoices[] = {
|
||||||
{ IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
|
{ IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
|
||||||
{ IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
|
{ IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
|
||||||
@ -1108,13 +1096,6 @@ const Experiment kExperiments[] = {
|
|||||||
kOsCrOSOwnerOnly,
|
kOsCrOSOwnerOnly,
|
||||||
SINGLE_VALUE_TYPE(chromeos::switches::kDisableBootAnimation),
|
SINGLE_VALUE_TYPE(chromeos::switches::kDisableBootAnimation),
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"captive-portal-detector",
|
|
||||||
IDS_FLAGS_CAPTIVE_PORTAL_DETECTOR_NAME,
|
|
||||||
IDS_FLAGS_CAPTIVE_PORTAL_DETECTOR_DESCRIPTION,
|
|
||||||
kOsCrOSOwnerOnly,
|
|
||||||
MULTI_VALUE_TYPE(kChromeCaptivePortalDetectionChoices),
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"file-manager-show-checkboxes",
|
"file-manager-show-checkboxes",
|
||||||
IDS_FLAGS_FILE_MANAGER_SHOW_CHECKBOXES_NAME,
|
IDS_FLAGS_FILE_MANAGER_SHOW_CHECKBOXES_NAME,
|
||||||
|
@ -284,8 +284,6 @@ class KioskTest : public InProcessBrowserTest {
|
|||||||
virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
||||||
command_line->AppendSwitch(chromeos::switches::kLoginManager);
|
command_line->AppendSwitch(chromeos::switches::kLoginManager);
|
||||||
command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
|
command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
|
||||||
command_line->AppendSwitch(
|
|
||||||
chromeos::switches::kDisableChromeCaptivePortalDetector);
|
|
||||||
command_line->AppendSwitch(::switches::kDisableBackgroundNetworking);
|
command_line->AppendSwitch(::switches::kDisableBackgroundNetworking);
|
||||||
command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
|
command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
|
||||||
|
|
||||||
|
@ -34,8 +34,6 @@ class OobeTest : public InProcessBrowserTest {
|
|||||||
virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
||||||
command_line->AppendSwitch(chromeos::switches::kLoginManager);
|
command_line->AppendSwitch(chromeos::switches::kLoginManager);
|
||||||
command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
|
command_line->AppendSwitch(chromeos::switches::kForceLoginManagerInTests);
|
||||||
command_line->AppendSwitch(
|
|
||||||
chromeos::switches::kDisableChromeCaptivePortalDetector);
|
|
||||||
command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
|
command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile, "user");
|
||||||
command_line->AppendSwitchASCII(
|
command_line->AppendSwitchASCII(
|
||||||
chromeos::switches::kAuthExtensionPath, "gaia_auth");
|
chromeos::switches::kAuthExtensionPath, "gaia_auth");
|
||||||
|
@ -23,11 +23,6 @@ bool IsTestMode() {
|
|||||||
return CommandLine::ForCurrentProcess()->HasSwitch(::switches::kTestType);
|
return CommandLine::ForCurrentProcess()->HasSwitch(::switches::kTestType);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool IsEnabledInCommandLine() {
|
|
||||||
return !CommandLine::ForCurrentProcess()->HasSwitch(
|
|
||||||
switches::kDisableChromeCaptivePortalDetector);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Stub implementation of NetworkPortalDetector.
|
// Stub implementation of NetworkPortalDetector.
|
||||||
class NetworkPortalDetectorStubImpl : public NetworkPortalDetector {
|
class NetworkPortalDetectorStubImpl : public NetworkPortalDetector {
|
||||||
protected:
|
protected:
|
||||||
@ -67,7 +62,7 @@ void NetworkPortalDetector::Initialize() {
|
|||||||
return;
|
return;
|
||||||
CHECK(!g_network_portal_detector)
|
CHECK(!g_network_portal_detector)
|
||||||
<< "NetworkPortalDetector::Initialize() is called twice";
|
<< "NetworkPortalDetector::Initialize() is called twice";
|
||||||
if (!IsEnabledInCommandLine() || IsTestMode()) {
|
if (IsTestMode()) {
|
||||||
g_network_portal_detector = new NetworkPortalDetectorStubImpl();
|
g_network_portal_detector = new NetworkPortalDetectorStubImpl();
|
||||||
} else {
|
} else {
|
||||||
CHECK(g_browser_process);
|
CHECK(g_browser_process);
|
||||||
|
@ -27,11 +27,6 @@ const char kDefaultStubNetworkStateIdle[] = "default-stub-network-state-idle";
|
|||||||
// Disables wallpaper boot animation (except of OOBE case).
|
// Disables wallpaper boot animation (except of OOBE case).
|
||||||
const char kDisableBootAnimation[] = "disable-boot-animation";
|
const char kDisableBootAnimation[] = "disable-boot-animation";
|
||||||
|
|
||||||
// Disables Chrome Captive Portal detector, which initiates Captive
|
|
||||||
// Portal detection for new active networks.
|
|
||||||
const char kDisableChromeCaptivePortalDetector[] =
|
|
||||||
"disable-chrome-captive-portal-detector";
|
|
||||||
|
|
||||||
// Disables Google Drive integration.
|
// Disables Google Drive integration.
|
||||||
const char kDisableDrive[] = "disable-drive";
|
const char kDisableDrive[] = "disable-drive";
|
||||||
|
|
||||||
@ -77,11 +72,6 @@ const char kEnableBackgroundLoader[] = "enable-background-loader";
|
|||||||
// Enables switching between different cellular carriers from the UI.
|
// Enables switching between different cellular carriers from the UI.
|
||||||
const char kEnableCarrierSwitching[] = "enable-carrier-switching";
|
const char kEnableCarrierSwitching[] = "enable-carrier-switching";
|
||||||
|
|
||||||
// Enables Chrome Captive Portal detector, which initiates Captive
|
|
||||||
// Portal detection for new active networks.
|
|
||||||
const char kEnableChromeCaptivePortalDetector[] =
|
|
||||||
"enable-chrome-captive-portal-detector";
|
|
||||||
|
|
||||||
// Enables automatically initializing Google Drive offline mode on first run.
|
// Enables automatically initializing Google Drive offline mode on first run.
|
||||||
const char kEnableDriveOfflineFirstRun[] = "enable-drive-offline-first-run";
|
const char kEnableDriveOfflineFirstRun[] = "enable-drive-offline-first-run";
|
||||||
|
|
||||||
|
@ -26,7 +26,6 @@ CHROMEOS_EXPORT extern const char kAuthExtensionPath[];
|
|||||||
CHROMEOS_EXPORT extern const char kDbusStub[];
|
CHROMEOS_EXPORT extern const char kDbusStub[];
|
||||||
CHROMEOS_EXPORT extern const char kDefaultStubNetworkStateIdle[];
|
CHROMEOS_EXPORT extern const char kDefaultStubNetworkStateIdle[];
|
||||||
CHROMEOS_EXPORT extern const char kDisableBootAnimation[];
|
CHROMEOS_EXPORT extern const char kDisableBootAnimation[];
|
||||||
CHROMEOS_EXPORT extern const char kDisableChromeCaptivePortalDetector[];
|
|
||||||
CHROMEOS_EXPORT extern const char kDisableDrive[];
|
CHROMEOS_EXPORT extern const char kDisableDrive[];
|
||||||
CHROMEOS_EXPORT extern const char kDisableGeniusApp[];
|
CHROMEOS_EXPORT extern const char kDisableGeniusApp[];
|
||||||
CHROMEOS_EXPORT extern const char kDisableLocalAccounts[];
|
CHROMEOS_EXPORT extern const char kDisableLocalAccounts[];
|
||||||
@ -40,7 +39,6 @@ CHROMEOS_EXPORT extern const char kDisableStubEthernet[];
|
|||||||
CHROMEOS_EXPORT extern const char kEchoExtensionPath[];
|
CHROMEOS_EXPORT extern const char kEchoExtensionPath[];
|
||||||
CHROMEOS_EXPORT extern const char kEnableBackgroundLoader[];
|
CHROMEOS_EXPORT extern const char kEnableBackgroundLoader[];
|
||||||
CHROMEOS_EXPORT extern const char kEnableCarrierSwitching[];
|
CHROMEOS_EXPORT extern const char kEnableCarrierSwitching[];
|
||||||
CHROMEOS_EXPORT extern const char kEnableChromeCaptivePortalDetector[];
|
|
||||||
CHROMEOS_EXPORT extern const char kEnableDriveOfflineFirstRun[];
|
CHROMEOS_EXPORT extern const char kEnableDriveOfflineFirstRun[];
|
||||||
CHROMEOS_EXPORT extern const char kEnableEnterpriseUserReporting[];
|
CHROMEOS_EXPORT extern const char kEnableEnterpriseUserReporting[];
|
||||||
CHROMEOS_EXPORT extern const char kEnableIMEModeIndicator[];
|
CHROMEOS_EXPORT extern const char kEnableIMEModeIndicator[];
|
||||||
|
Reference in New Issue
Block a user