Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(117)

Side by Side Diff: chrome/browser/ui/gtk/view_id_util_browsertest.cc

Issue 10834171: Revert 143421 to disable Chrome to Mobile by default on trunk (for M22 branch). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/chrome_to_mobile_service.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Deleted: svn:mergeinfo
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <gtk/gtk.h> 5 #include <gtk/gtk.h>
6 6
7 #include "chrome/browser/ui/browser.h" 7 #include "chrome/browser/ui/browser.h"
8 #include "chrome/browser/ui/browser_commands.h" 8 #include "chrome/browser/ui/browser_commands.h"
9 #include "chrome/browser/ui/browser_window.h" 9 #include "chrome/browser/ui/browser_window.h"
10 #include "chrome/browser/ui/gtk/view_id_util.h" 10 #include "chrome/browser/ui/gtk/view_id_util.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 i == VIEW_ID_DEV_TOOLS_DOCKED || 42 i == VIEW_ID_DEV_TOOLS_DOCKED ||
43 i == VIEW_ID_DOWNLOAD_SHELF || 43 i == VIEW_ID_DOWNLOAD_SHELF ||
44 i == VIEW_ID_BOOKMARK_BAR_ELEMENT || 44 i == VIEW_ID_BOOKMARK_BAR_ELEMENT ||
45 i == VIEW_ID_TAB || 45 i == VIEW_ID_TAB ||
46 i == VIEW_ID_FEEDBACK_BUTTON || 46 i == VIEW_ID_FEEDBACK_BUTTON ||
47 i == VIEW_ID_OMNIBOX || 47 i == VIEW_ID_OMNIBOX ||
48 i == VIEW_ID_METRO_PIN) { 48 i == VIEW_ID_METRO_PIN) {
49 continue; 49 continue;
50 } 50 }
51 51
52 // Chrome To Mobile is disabled by default.
53 if (i == VIEW_ID_CHROME_TO_MOBILE_BUTTON)
54 continue;
55
52 CheckViewID(static_cast<ViewID>(i), true); 56 CheckViewID(static_cast<ViewID>(i), true);
53 } 57 }
54 58
55 CheckViewID(VIEW_ID_PREDEFINED_COUNT, false); 59 CheckViewID(VIEW_ID_PREDEFINED_COUNT, false);
56 } 60 }
57 61
58 IN_PROC_BROWSER_TEST_F(ViewIDTest, Delegate) { 62 IN_PROC_BROWSER_TEST_F(ViewIDTest, Delegate) {
59 CheckViewID(VIEW_ID_TAB_0, true); 63 CheckViewID(VIEW_ID_TAB_0, true);
60 CheckViewID(VIEW_ID_TAB_1, false); 64 CheckViewID(VIEW_ID_TAB_1, false);
61 65
62 browser()->OpenURL(OpenURLParams(GURL(chrome::kAboutBlankURL), 66 browser()->OpenURL(OpenURLParams(GURL(chrome::kAboutBlankURL),
63 content::Referrer(), 67 content::Referrer(),
64 NEW_BACKGROUND_TAB, content::PAGE_TRANSITION_TYPED, 68 NEW_BACKGROUND_TAB, content::PAGE_TRANSITION_TYPED,
65 false)); 69 false));
66 70
67 CheckViewID(VIEW_ID_TAB_0, true); 71 CheckViewID(VIEW_ID_TAB_0, true);
68 CheckViewID(VIEW_ID_TAB_1, true); 72 CheckViewID(VIEW_ID_TAB_1, true);
69 } 73 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_to_mobile_service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698