diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-04 21:20:15 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-04 21:20:15 +0000 |
| commit | a295e6378cd3e264bd81fcb45901b2b45cd48d03 (patch) | |
| tree | d9e7e2d13f3c6de7880f01e90a2831eafee28cb8 | |
| parent | 0ab4f055b3b70db9f93656f87341a1fdccf78676 (diff) | |
| download | chromium_src-a295e6378cd3e264bd81fcb45901b2b45cd48d03.zip chromium_src-a295e6378cd3e264bd81fcb45901b2b45cd48d03.tar.gz chromium_src-a295e6378cd3e264bd81fcb45901b2b45cd48d03.tar.bz2 | |
Disable Chrome To Mobile by default; enable via chrome://flags.
This feature should be disabled-by-default on M19; for immediate merge.
Don't revert http://crrev.com/130312 to keep the AboutFlags_disable-chrome-to-mobile UMA bin.
Note: Mac's ViewIDTests don't yet support VIEW_ID_CHROME_TO_MOBILE_BUTTON.
BUG=102709, 120905
TEST=Chrome To Mobile is disabled on trunk (to be merged to M19).
Review URL: https://chromiumcodereview.appspot.com/10376009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135442 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/about_flags.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/chrome_to_mobile_service.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/gtk/view_id_util_browsertest.cc | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 9646d30..e1616ff 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -609,11 +609,11 @@ const Experiment kExperiments[] = { SINGLE_VALUE_TYPE(switches::kEnableSuggestionsTabPage) }, { - "disable-chrome-to-mobile", // FLAGS:RECORD_UMA - IDS_FLAGS_DISABLE_CHROME_TO_MOBILE_NAME, - IDS_FLAGS_DISABLE_CHROME_TO_MOBILE_DESCRIPTION, + "enable-chrome-to-mobile", // FLAGS:RECORD_UMA + IDS_FLAGS_ENABLE_CHROME_TO_MOBILE_NAME, + IDS_FLAGS_ENABLE_CHROME_TO_MOBILE_DESCRIPTION, kOsAll, - SINGLE_VALUE_TYPE(switches::kDisableChromeToMobile) + SINGLE_VALUE_TYPE(switches::kEnableChromeToMobile) }, #if defined(GOOGLE_CHROME_BUILD) { diff --git a/chrome/browser/chrome_to_mobile_service.cc b/chrome/browser/chrome_to_mobile_service.cc index 720d9ba..0e0396a 100644 --- a/chrome/browser/chrome_to_mobile_service.cc +++ b/chrome/browser/chrome_to_mobile_service.cc @@ -40,7 +40,7 @@ namespace { // The default enabled/disabled state of the Chrome To Mobile feature. -const bool kChromeToMobileEnabled = true; +const bool kChromeToMobileEnabled = false; // The maximum number of retries for the URLFetcher requests. const size_t kMaxRetries = 1; diff --git a/chrome/browser/ui/gtk/view_id_util_browsertest.cc b/chrome/browser/ui/gtk/view_id_util_browsertest.cc index d460cf2..579567b 100644 --- a/chrome/browser/ui/gtk/view_id_util_browsertest.cc +++ b/chrome/browser/ui/gtk/view_id_util_browsertest.cc @@ -47,6 +47,10 @@ IN_PROC_BROWSER_TEST_F(ViewIDTest, Basic) { continue; } + // Chrome To Mobile is disabled by default. + if (i == VIEW_ID_CHROME_TO_MOBILE_BUTTON) + continue; + CheckViewID(static_cast<ViewID>(i), true); } |