summaryrefslogtreecommitdiffstats
path: root/chromeos
diff options
context:
space:
mode:
authorygorshenin@chromium.org <ygorshenin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-29 03:40:39 +0000
committerygorshenin@chromium.org <ygorshenin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-29 03:40:39 +0000
commit292ff3178fd8c6037b9d7dda01904b15fb4662f9 (patch)
tree0b898aa9d99a649994c3c08187269bd383776b9d /chromeos
parent83b2d24d48d6d23e0b256186338d09992c274dd4 (diff)
downloadchromium_src-292ff3178fd8c6037b9d7dda01904b15fb4662f9.zip
chromium_src-292ff3178fd8c6037b9d7dda01904b15fb4662f9.tar.gz
chromium_src-292ff3178fd8c6037b9d7dda01904b15fb4662f9.tar.bz2
Implemented portal detection + network error handling during the OOBE update stage.
BUG=170102, 123577 TEST=Manual tests on Lumpy and Linux ChromeOS build TBR=sky Review URL: https://chromiumcodereview.appspot.com/12838006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191282 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
-rw-r--r--chromeos/chromeos_switches.cc5
-rw-r--r--chromeos/chromeos_switches.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc
index 09e8736..e08e74a 100644
--- a/chromeos/chromeos_switches.cc
+++ b/chromeos/chromeos_switches.cc
@@ -23,6 +23,11 @@ const char kEnableExperimentalBluetooth[] = "enable-experimental-bluetooth";
const char kEnableNewNetworkChangeNotifier[] =
"enable-new-network-change-notifier";
+// Enables portal detection and network error handling before auto
+// update.
+const char kEnableOOBEBlockingUpdate[] =
+ "enable-oobe-blocking-update";
+
// Enables usage of the new ManagedNetworkConfigurationHandler and
// NetworkConfigurationHandler singletons.
const char kUseNewNetworkConfigurationHandlers[] =
diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h
index 9869d65c..1d5dd59 100644
--- a/chromeos/chromeos_switches.h
+++ b/chromeos/chromeos_switches.h
@@ -25,6 +25,7 @@ CHROMEOS_EXPORT extern const char kDbusStub[];
CHROMEOS_EXPORT extern const char kDisableStubEthernet[];
CHROMEOS_EXPORT extern const char kEnableExperimentalBluetooth[];
CHROMEOS_EXPORT extern const char kEnableNewNetworkChangeNotifier[];
+CHROMEOS_EXPORT extern const char kEnableOOBEBlockingUpdate[];
CHROMEOS_EXPORT extern const char kUseNewNetworkConfigurationHandlers[];
CHROMEOS_EXPORT extern const char kEnableScreensaverExtensions[];
CHROMEOS_EXPORT extern const char kEnableStubInteractive[];