diff options
| author | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-31 03:47:37 +0000 |
|---|---|---|
| committer | xiyuan@chromium.org <xiyuan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-31 03:47:37 +0000 |
| commit | 68eb731369add4bd607f74c4a15163ba5e9336f7 (patch) | |
| tree | a927da42cb160f498adf17b7cf76486d0686b467 /chromeos | |
| parent | 6038d733c0ee051e73c15a6fd92e75e86380624a (diff) | |
| download | chromium_src-68eb731369add4bd607f74c4a15163ba5e9336f7.zip chromium_src-68eb731369add4bd607f74c4a15163ba5e9336f7.tar.gz chromium_src-68eb731369add4bd607f74c4a15163ba5e9336f7.tar.bz2 | |
cros: Move kiosk settings to extensions page.
- Move kiosk settings to extensions page;
- Remove the M28 temp flag;
BUG=228860
Review URL: https://chromiumcodereview.appspot.com/15966004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203327 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 340c0f5..d9d7893 100644 --- a/chromeos/chromeos_switches.cc +++ b/chromeos/chromeos_switches.cc @@ -104,10 +104,6 @@ const char kEnableTouchpadThreeFingerSwipe[] // than the kiosk app mode. const char kEnableKioskMode[] = "enable-kiosk-mode"; -// Enable kiosk app settings UI. -// TODO(xiyuan): Remove this flag after http://crbug.com/228860. -const char kEnableKioskAppSettings[] = "enable-kiosk-app-settings"; - // Enables request of tablet site (via user agent override). const char kEnableRequestTabletSite[] = "enable-request-tablet-site"; diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h index cca4c37..efe5c09 100644 --- a/chromeos/chromeos_switches.h +++ b/chromeos/chromeos_switches.h @@ -43,7 +43,6 @@ CHROMEOS_EXPORT extern const char kEnableCarrierSwitching[]; CHROMEOS_EXPORT extern const char kEnableChromeAudioSwitching[]; CHROMEOS_EXPORT extern const char kEnableChromeCaptivePortalDetector[]; CHROMEOS_EXPORT extern const char kEnableKioskMode[]; -CHROMEOS_EXPORT extern const char kEnableKioskAppSettings[]; CHROMEOS_EXPORT extern const char kEnableRequestTabletSite[]; CHROMEOS_EXPORT extern const char kEnableScreensaverExtensions[]; CHROMEOS_EXPORT extern const char kEnableStaticIPConfig[]; |