diff options
author | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-04 03:40:25 +0000 |
---|---|---|
committer | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-04 03:40:25 +0000 |
commit | 065cd860161f3e90f7467260b15e150393c22d81 (patch) | |
tree | 6e2a0351778b2a2f4654a4bd9c98e09adab16cbd /chromeos | |
parent | cbe65a02120229ddc45b6ccc3a13d06d03cc9b90 (diff) | |
download | chromium_src-065cd860161f3e90f7467260b15e150393c22d81.zip chromium_src-065cd860161f3e90f7467260b15e150393c22d81.tar.gz chromium_src-065cd860161f3e90f7467260b15e150393c22d81.tar.bz2 |
This removes the --enable-static-ip-config flag, and makes it the default.
This simply enables static IP configuration for WiFi networks, which used
to be behind the flag, but can now be the default.
BUG=160060,175771,140124
TEST=Ran on device, changed DNS and IP for WiFi connection and and
made sure that resolve.conf and ifconfig output updated
appropriately.
Review URL: https://codereview.chromium.org/25684004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226945 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
-rw-r--r-- | chromeos/chromeos_switches.cc | 4 | ||||
-rw-r--r-- | chromeos/chromeos_switches.h | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc index 935dd0f..f9d719d 100644 --- a/chromeos/chromeos_switches.cc +++ b/chromeos/chromeos_switches.cc @@ -112,10 +112,6 @@ const char kEnableKioskMode[] = "enable-kiosk-mode"; // Enables request of tablet site (via user agent override). const char kEnableRequestTabletSite[] = "enable-request-tablet-site"; -// Enables static ip configuration. This flag should be removed when it's on by -// default. -const char kEnableStaticIPConfig[] = "enable-static-ip-config"; - // Power of the power-of-2 initial modulus that will be used by the // auto-enrollment client. E.g. "4" means the modulus will be 2^4 = 16. const char kEnterpriseEnrollmentInitialModulus[] = diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h index d8cdd1f..fc3bacc 100644 --- a/chromeos/chromeos_switches.h +++ b/chromeos/chromeos_switches.h @@ -47,7 +47,6 @@ CHROMEOS_EXPORT extern const char kEnableIMEModeIndicator[]; CHROMEOS_EXPORT extern const char kEnableKioskMode[]; CHROMEOS_EXPORT extern const char kEnableRequestTabletSite[]; CHROMEOS_EXPORT extern const char kEnableScreensaverExtensions[]; -CHROMEOS_EXPORT extern const char kEnableStaticIPConfig[]; CHROMEOS_EXPORT extern const char kEnableStubInteractive[]; CHROMEOS_EXPORT extern const char kEnableStubPortalledWifi[]; CHROMEOS_EXPORT extern const char kEnableTouchpadThreeFingerClick[]; |