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

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

Issue 3129003: remove toolstrips (Closed)
Patch Set: merge Created 10 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
« no previous file with comments | « chrome/browser/gtk/view_id_util.cc ('k') | chrome/browser/renderer_host/render_view_host.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/browser.h" 7 #include "chrome/browser/browser.h"
8 #include "chrome/browser/browser_window.h" 8 #include "chrome/browser/browser_window.h"
9 #include "chrome/browser/gtk/view_id_util.h" 9 #include "chrome/browser/gtk/view_id_util.h"
10 #include "chrome/common/url_constants.h" 10 #include "chrome/common/url_constants.h"
(...skipping 15 matching lines...) Expand all
26 private: 26 private:
27 GtkWidget* root_window_; 27 GtkWidget* root_window_;
28 }; 28 };
29 29
30 IN_PROC_BROWSER_TEST_F(ViewIDTest, Basic) { 30 IN_PROC_BROWSER_TEST_F(ViewIDTest, Basic) {
31 // Make sure FindBar is created to test 31 // Make sure FindBar is created to test
32 // VIEW_ID_FIND_IN_PAGE_TEXT_FIELD and VIEW_ID_FIND_IN_PAGE. 32 // VIEW_ID_FIND_IN_PAGE_TEXT_FIELD and VIEW_ID_FIND_IN_PAGE.
33 browser()->ShowFindBar(); 33 browser()->ShowFindBar();
34 34
35 for (int i = VIEW_ID_TOOLBAR; i < VIEW_ID_PREDEFINED_COUNT; ++i) { 35 for (int i = VIEW_ID_TOOLBAR; i < VIEW_ID_PREDEFINED_COUNT; ++i) {
36 // Extension shelf is being removed, http://crbug.com/25106.
37 if (i == VIEW_ID_DEV_EXTENSION_SHELF)
38 continue;
39
40 // The following ids are used only in views implementation. 36 // The following ids are used only in views implementation.
41 if (i == VIEW_ID_CONTENTS_SPLIT || 37 if (i == VIEW_ID_CONTENTS_SPLIT ||
42 i == VIEW_ID_INFO_BAR_CONTAINER || 38 i == VIEW_ID_INFO_BAR_CONTAINER ||
43 i == VIEW_ID_DOWNLOAD_SHELF || 39 i == VIEW_ID_DOWNLOAD_SHELF ||
44 i == VIEW_ID_BOOKMARK_BAR_ELEMENT || 40 i == VIEW_ID_BOOKMARK_BAR_ELEMENT ||
45 i == VIEW_ID_TAB) { 41 i == VIEW_ID_TAB) {
46 continue; 42 continue;
47 } 43 }
48 44
49 CheckViewID(static_cast<ViewID>(i), true); 45 CheckViewID(static_cast<ViewID>(i), true);
50 } 46 }
51 47
52 CheckViewID(VIEW_ID_PREDEFINED_COUNT, false); 48 CheckViewID(VIEW_ID_PREDEFINED_COUNT, false);
53 } 49 }
54 50
55 IN_PROC_BROWSER_TEST_F(ViewIDTest, Delegate) { 51 IN_PROC_BROWSER_TEST_F(ViewIDTest, Delegate) {
56 CheckViewID(VIEW_ID_TAB_0, true); 52 CheckViewID(VIEW_ID_TAB_0, true);
57 CheckViewID(VIEW_ID_TAB_1, false); 53 CheckViewID(VIEW_ID_TAB_1, false);
58 54
59 browser()->OpenURL(GURL(chrome::kAboutBlankURL), GURL(), 55 browser()->OpenURL(GURL(chrome::kAboutBlankURL), GURL(),
60 NEW_BACKGROUND_TAB, PageTransition::TYPED); 56 NEW_BACKGROUND_TAB, PageTransition::TYPED);
61 57
62 CheckViewID(VIEW_ID_TAB_0, true); 58 CheckViewID(VIEW_ID_TAB_0, true);
63 CheckViewID(VIEW_ID_TAB_1, true); 59 CheckViewID(VIEW_ID_TAB_1, true);
64 } 60 }
OLDNEW
« no previous file with comments | « chrome/browser/gtk/view_id_util.cc ('k') | chrome/browser/renderer_host/render_view_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698