diff options
| -rw-r--r-- | chrome/app/generated_resources.grd | 8 | ||||
| -rw-r--r-- | chrome/browser/about_flags.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/browser_about_handler.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/browser.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/options/extension_settings_handler.cc | 2 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.cc | 6 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 2 | ||||
| -rw-r--r-- | chrome/test/base/in_process_browser_test.cc | 2 | ||||
| -rwxr-xr-x | chrome/test/pyautolib/pyauto.py | 1 | ||||
| -rw-r--r-- | chrome/test/ui/ui_test.cc | 1 |
10 files changed, 20 insertions, 16 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index b86cd4e..e1e455e 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -7988,11 +7988,11 @@ To hide access to this program, you need to uninstall it by using Would you like to start <ph name="CONTROL_PANEL_APPLET_NAME">$1<ex>Add/Remove Programs</ex></ph>? </message> - <message name="IDS_FLAGS_ENABLE_UBER_PAGE_NAME" desc="Title for the flag to enable uber page URL redirection."> - Enable Uber page (settings, extensions, about/help) + <message name="IDS_FLAGS_DISABLE_UBER_PAGE_NAME" desc="Title for the flag to disable uber page URL redirection."> + Disable new settings and extensions web-ui </message> - <message name="IDS_FLAGS_ENABLE_UBER_PAGE_DESCRIPTION" desc="Description for the flag to enable uber page URL redirection."> - Enable the new "uber" page which contains settings, extensions, about/help. + <message name="IDS_FLAGS_DISABLE_UBER_PAGE_DESCRIPTION" desc="Description for the flag to disable uber page URL redirection."> + The settings and extensions web-ui will be reverted to the prior implementation. </message> <!-- Settings --> diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 6f37e37..abd0ed4 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -549,11 +549,11 @@ const Experiment kExperiments[] = { SINGLE_VALUE_TYPE(switches::kEnableMediaStream) }, { - "enable-uber-page", - IDS_FLAGS_ENABLE_UBER_PAGE_NAME, - IDS_FLAGS_ENABLE_UBER_PAGE_DESCRIPTION, + "disable-uber-page", + IDS_FLAGS_DISABLE_UBER_PAGE_NAME, + IDS_FLAGS_DISABLE_UBER_PAGE_DESCRIPTION, kOsAll, - SINGLE_VALUE_TYPE(switches::kEnableUberPage) + SINGLE_VALUE_TYPE(switches::kDisableUberPage) }, { "enable-shadow-dom", diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index 6edf4ba..7212cb6 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -109,7 +109,7 @@ bool WillHandleBrowserAboutURL(GURL* url, return false; CommandLine* cl = CommandLine::ForCurrentProcess(); - bool enableUberPage = cl->HasSwitch(switches::kEnableUberPage); + bool enableUberPage = !cl->HasSwitch(switches::kDisableUberPage); std::string host(url->host()); std::string path; diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 50f353f..8c71cbf 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -2215,7 +2215,7 @@ void Browser::ShowDownloadsTab() { void Browser::ShowExtensionsTab() { content::RecordAction(UserMetricsAction("ShowExtensions")); - if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableUberPage)) { + if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableUberPage)) { ShowOptionsTab(chrome::kExtensionsSubPage); } else { browser::NavigateParams params(GetSingletonTabNavigateParams( @@ -2247,7 +2247,7 @@ void Browser::ShowBrokenPageTab(WebContents* contents) { } void Browser::ShowOptionsTab(const std::string& sub_page) { - if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableUberPage)) { + if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableUberPage)) { browser::NavigateParams params(GetSingletonTabNavigateParams( GURL(chrome::kChromeUISettingsURL + sub_page))); params.path_behavior = browser::NavigateParams::IGNORE_AND_NAVIGATE; diff --git a/chrome/browser/ui/webui/options/extension_settings_handler.cc b/chrome/browser/ui/webui/options/extension_settings_handler.cc index 10e3212..c5a1198 100644 --- a/chrome/browser/ui/webui/options/extension_settings_handler.cc +++ b/chrome/browser/ui/webui/options/extension_settings_handler.cc @@ -258,7 +258,7 @@ void ExtensionSettingsHandler::HandleToggleDeveloperMode( profile->GetPrefs()->GetBoolean(prefs::kExtensionsUIDeveloperMode); profile->GetPrefs()->SetBoolean( prefs::kExtensionsUIDeveloperMode, !developer_mode); - if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableUberPage)) + if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableUberPage)) HandleRequestExtensionsData(NULL); } diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 30ceaac..b1bea82 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -393,6 +393,9 @@ const char kDisableTLS1[] = "disable-tls1"; // disable translate with the preference. const char kDisableTranslate[] = "disable-translate"; +// Disable uber page command and URL redirection. +const char kDisableUberPage[] = "disable-uber-page"; + // Disables the backend service for web resources. const char kDisableWebResources[] = "disable-web-resources"; @@ -573,9 +576,6 @@ const char kEnableSyncTabsForOtherClients[] = // Enables context menu for selecting groups of tabs. const char kEnableTabGroupsContextMenu[] = "enable-tab-groups-context-menu"; -// Enable uber page command and URL redirection. -const char kEnableUberPage[] = "enable-uber-page"; - // Spawns threads to watch for excessive delays in specified message loops. // User should set breakpoints on Alarm() to examine problematic thread. // diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index 213f068..f486bd0 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -115,6 +115,7 @@ extern const char kDisableSyncTypedUrls[]; extern const char kDisableTabCloseableStateWatcher[]; extern const char kDisableTLS1[]; extern const char kDisableTranslate[]; +extern const char kDisableUberPage[]; extern const char kDisableWebResources[]; extern const char kDiskCacheDir[]; extern const char kDiskCacheSize[]; @@ -165,7 +166,6 @@ extern const char kEnableSyncTabs[]; extern const char kEnableSyncTabsForOtherClients[]; extern const char kEnableTabGroupsContextMenu[]; extern const char kEnableTopSites[]; -extern const char kEnableUberPage[]; extern const char kEnableWatchdog[]; extern const char kEnableWebSocketOverSpdy[]; extern const char kEnableWebStoreLink[]; diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc index ac7a1c1..89d0e56 100644 --- a/chrome/test/base/in_process_browser_test.cc +++ b/chrome/test/base/in_process_browser_test.cc @@ -167,6 +167,8 @@ void InProcessBrowserTest::PrepareTestCommandLine(CommandLine* command_line) { // If neccessary, disable TabCloseableStateWatcher. if (!tab_closeable_state_watcher_enabled_) command_line->AppendSwitch(switches::kDisableTabCloseableStateWatcher); + + command_line->AppendSwitch(switches::kDisableUberPage); } bool InProcessBrowserTest::CreateUserDataDirectory() { diff --git a/chrome/test/pyautolib/pyauto.py b/chrome/test/pyautolib/pyauto.py index f8b575b..5cdcde0 100755 --- a/chrome/test/pyautolib/pyauto.py +++ b/chrome/test/pyautolib/pyauto.py @@ -243,6 +243,7 @@ class PyUITest(pyautolib.PyUITestBase, unittest.TestCase): '--allow-file-access-from-files', '--enable-file-cookies', '--dom-automation', + '--disable-uber-page', '--skip-oauth-login', # Enables injection of test content script for webui login automation '--auth-ext-path=/usr/share/chromeos-assets/gaia_auth', diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index d08483c..3d179946 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -210,6 +210,7 @@ void UITestBase::SetLaunchSwitches() { launch_arguments_.AppendSwitch(switches::kTestCompositor); } #endif + launch_arguments_.AppendSwitch(switches::kDisableUberPage); } void UITestBase::SetUpProfile() { |