diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-03 04:42:24 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-03 04:42:24 +0000 |
| commit | 0b777be2855f9901bf410636186eef193f42694d (patch) | |
| tree | 2f3b30da1826dc65b9c52d5c3ea5650686e96558 /chrome/browser/ui/cocoa/view_id_util_browsertest.mm | |
| parent | 6e8c06595173e67890421b44c2440ca2c772553b (diff) | |
| download | chromium_src-0b777be2855f9901bf410636186eef193f42694d.zip chromium_src-0b777be2855f9901bf410636186eef193f42694d.tar.gz chromium_src-0b777be2855f9901bf410636186eef193f42694d.tar.bz2 | |
Enable Chrome To Mobile by default; disable via chrome://flags.
This re-enables Chrome To Mobile on trunk/M20 for now.
I'm not reverting crrev.com/129552 (disable CL) in order to keep the AboutFlags_enable-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 enabled on trunk (not M19).
Review URL: https://chromiumcodereview.appspot.com/9969063
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/cocoa/view_id_util_browsertest.mm')
| -rw-r--r-- | chrome/browser/ui/cocoa/view_id_util_browsertest.mm | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/chrome/browser/ui/cocoa/view_id_util_browsertest.mm b/chrome/browser/ui/cocoa/view_id_util_browsertest.mm index 13a8429..405c295 100644 --- a/chrome/browser/ui/cocoa/view_id_util_browsertest.mm +++ b/chrome/browser/ui/cocoa/view_id_util_browsertest.mm @@ -69,14 +69,11 @@ class ViewIDTest : public InProcessBrowserTest { i == VIEW_ID_AUTOCOMPLETE || i == VIEW_ID_CONTENTS_SPLIT || i == VIEW_ID_FEEDBACK_BUTTON || - i == VIEW_ID_OMNIBOX) { + i == VIEW_ID_OMNIBOX || + i == VIEW_ID_CHROME_TO_MOBILE_BUTTON) { continue; } - // Chrome To Mobile is disabled by default. - if (i == VIEW_ID_CHROME_TO_MOBILE_BUTTON) - continue; - CheckViewID(static_cast<ViewID>(i), true); } |