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

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

Issue 2853024: Remove the bookmark menu. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 5 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/gtk/view_id_util.cc ('k') | chrome/browser/view_ids.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) 2009 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"
11 #include "chrome/test/in_process_browser_test.h" 11 #include "chrome/test/in_process_browser_test.h"
(...skipping 14 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 // http://crbug.com/21152
37 if (i == VIEW_ID_BOOKMARK_MENU)
38 continue;
39
40 // Extension shelf is being removed, http://crbug.com/25106. 36 // Extension shelf is being removed, http://crbug.com/25106.
41 if (i == VIEW_ID_DEV_EXTENSION_SHELF) 37 if (i == VIEW_ID_DEV_EXTENSION_SHELF)
42 continue; 38 continue;
43 39
44 // The following ids are used only in views implementation. 40 // The following ids are used only in views implementation.
45 if (i == VIEW_ID_CONTENTS_SPLIT || 41 if (i == VIEW_ID_CONTENTS_SPLIT ||
46 i == VIEW_ID_INFO_BAR_CONTAINER || 42 i == VIEW_ID_INFO_BAR_CONTAINER ||
47 i == VIEW_ID_DOWNLOAD_SHELF || 43 i == VIEW_ID_DOWNLOAD_SHELF ||
48 i == VIEW_ID_BOOKMARK_BAR_ELEMENT) { 44 i == VIEW_ID_BOOKMARK_BAR_ELEMENT) {
49 continue; 45 continue;
50 } 46 }
51 47
52 CheckViewID(static_cast<ViewID>(i), true); 48 CheckViewID(static_cast<ViewID>(i), true);
53 } 49 }
54 50
55 CheckViewID(VIEW_ID_PREDEFINED_COUNT, false); 51 CheckViewID(VIEW_ID_PREDEFINED_COUNT, false);
56 } 52 }
57 53
58 IN_PROC_BROWSER_TEST_F(ViewIDTest, Delegate) { 54 IN_PROC_BROWSER_TEST_F(ViewIDTest, Delegate) {
59 CheckViewID(VIEW_ID_TAB_0, true); 55 CheckViewID(VIEW_ID_TAB_0, true);
60 CheckViewID(VIEW_ID_TAB_1, false); 56 CheckViewID(VIEW_ID_TAB_1, false);
61 57
62 browser()->OpenURL(GURL(chrome::kAboutBlankURL), GURL(), 58 browser()->OpenURL(GURL(chrome::kAboutBlankURL), GURL(),
63 NEW_BACKGROUND_TAB, PageTransition::TYPED); 59 NEW_BACKGROUND_TAB, PageTransition::TYPED);
64 60
65 CheckViewID(VIEW_ID_TAB_0, true); 61 CheckViewID(VIEW_ID_TAB_0, true);
66 CheckViewID(VIEW_ID_TAB_1, true); 62 CheckViewID(VIEW_ID_TAB_1, true);
67 } 63 }
OLDNEW
« no previous file with comments | « chrome/browser/gtk/view_id_util.cc ('k') | chrome/browser/view_ids.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698