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

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

Issue 10828193: Revert 148511 - Add pin icon to the omnibar in windows 8 metro mode. (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
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 26 matching lines...) Expand all
37 37
38 for (int i = VIEW_ID_TOOLBAR; i < VIEW_ID_PREDEFINED_COUNT; ++i) { 38 for (int i = VIEW_ID_TOOLBAR; i < VIEW_ID_PREDEFINED_COUNT; ++i) {
39 // The following ids are used only in views implementation. 39 // The following ids are used only in views implementation.
40 if (i == VIEW_ID_CONTENTS_SPLIT || 40 if (i == VIEW_ID_CONTENTS_SPLIT ||
41 i == VIEW_ID_INFO_BAR_CONTAINER || 41 i == VIEW_ID_INFO_BAR_CONTAINER ||
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) {
49 continue; 48 continue;
50 } 49 }
51 50
52 // Chrome To Mobile is disabled by default. 51 // Chrome To Mobile is disabled by default.
53 if (i == VIEW_ID_CHROME_TO_MOBILE_BUTTON) 52 if (i == VIEW_ID_CHROME_TO_MOBILE_BUTTON)
54 continue; 53 continue;
55 54
56 CheckViewID(static_cast<ViewID>(i), true); 55 CheckViewID(static_cast<ViewID>(i), true);
57 } 56 }
58 57
59 CheckViewID(VIEW_ID_PREDEFINED_COUNT, false); 58 CheckViewID(VIEW_ID_PREDEFINED_COUNT, false);
60 } 59 }
61 60
62 IN_PROC_BROWSER_TEST_F(ViewIDTest, Delegate) { 61 IN_PROC_BROWSER_TEST_F(ViewIDTest, Delegate) {
63 CheckViewID(VIEW_ID_TAB_0, true); 62 CheckViewID(VIEW_ID_TAB_0, true);
64 CheckViewID(VIEW_ID_TAB_1, false); 63 CheckViewID(VIEW_ID_TAB_1, false);
65 64
66 browser()->OpenURL(OpenURLParams(GURL(chrome::kAboutBlankURL), 65 browser()->OpenURL(OpenURLParams(GURL(chrome::kAboutBlankURL),
67 content::Referrer(), 66 content::Referrer(),
68 NEW_BACKGROUND_TAB, content::PAGE_TRANSITION_TYPED, 67 NEW_BACKGROUND_TAB, content::PAGE_TRANSITION_TYPED,
69 false)); 68 false));
70 69
71 CheckViewID(VIEW_ID_TAB_0, true); 70 CheckViewID(VIEW_ID_TAB_0, true);
72 CheckViewID(VIEW_ID_TAB_1, true); 71 CheckViewID(VIEW_ID_TAB_1, true);
73 } 72 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/view_id_util_browsertest.mm ('k') | chrome/browser/ui/metro_pin_tab_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698