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

Side by Side Diff: chrome/browser/ui/toolbar/wrench_menu_model.h

Issue 10837317: Setting the touch wrench menu as default menu for ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: And another merge! Created 8 years, 3 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 #ifndef CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_ 5 #ifndef CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_
6 #define CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_ 6 #define CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_
7 7
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" 10 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 // Testing constructor used for mocking. 126 // Testing constructor used for mocking.
127 friend class ::MockWrenchMenuModel; 127 friend class ::MockWrenchMenuModel;
128 WrenchMenuModel(); 128 WrenchMenuModel();
129 129
130 void Build(); 130 void Build();
131 131
132 void AddGlobalErrorMenuItems(); 132 void AddGlobalErrorMenuItems();
133 133
134 // Appends everything needed for the clipboard menu: a menu break, the 134 // Appends everything needed for the clipboard menu: a menu break, the
135 // clipboard menu content and the finalizing menu break. If the last break 135 // clipboard menu content and the finalizing menu break. If the last break
136 // is not needed it can be suppressed by setting |append_final_separator| 136 // is not needed it can be suppressed by setting |new_menu|
137 // to false. 137 // to false.
138 void CreateCutCopyPasteMenu(bool append_final_separator); 138 void CreateCutCopyPasteMenu(bool new_menu);
139 139
140 // Appends everything needed for the zoom menu: a menu break, then the zoom 140 // Appends everything needed for the zoom menu: a menu break, then the zoom
141 // menu content and then another menu break. 141 // menu content and then another menu break. If the new menu type is used,
142 void CreateZoomMenu(); 142 // |new_menu| should be set to true.
143 void CreateZoomMenu(bool new_menu);
143 144
144 string16 GetSyncMenuLabel() const; 145 string16 GetSyncMenuLabel() const;
145 146
146 // Models for the special menu items with buttons. 147 // Models for the special menu items with buttons.
147 scoped_ptr<ui::ButtonMenuItemModel> edit_menu_item_model_; 148 scoped_ptr<ui::ButtonMenuItemModel> edit_menu_item_model_;
148 scoped_ptr<ui::ButtonMenuItemModel> zoom_menu_item_model_; 149 scoped_ptr<ui::ButtonMenuItemModel> zoom_menu_item_model_;
149 150
150 // Label of the zoom label in the zoom menu item. 151 // Label of the zoom label in the zoom menu item.
151 string16 zoom_label_; 152 string16 zoom_label_;
152 153
153 // Tools menu. 154 // Tools menu.
154 scoped_ptr<ToolsMenuModel> tools_menu_model_; 155 scoped_ptr<ToolsMenuModel> tools_menu_model_;
155 156
156 // Bookmark submenu. 157 // Bookmark submenu.
157 scoped_ptr<BookmarkSubMenuModel> bookmark_sub_menu_model_; 158 scoped_ptr<BookmarkSubMenuModel> bookmark_sub_menu_model_;
158 159
159 ui::AcceleratorProvider* provider_; // weak 160 ui::AcceleratorProvider* provider_; // weak
160 161
161 Browser* browser_; // weak 162 Browser* browser_; // weak
162 TabStripModel* tab_strip_model_; // weak 163 TabStripModel* tab_strip_model_; // weak
163 164
164 content::NotificationRegistrar registrar_; 165 content::NotificationRegistrar registrar_;
165 166
166 DISALLOW_COPY_AND_ASSIGN(WrenchMenuModel); 167 DISALLOW_COPY_AND_ASSIGN(WrenchMenuModel);
167 }; 168 };
168 169
169 #endif // CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_ 170 #endif // CHROME_BROWSER_UI_TOOLBAR_WRENCH_MENU_MODEL_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/toolbar/bookmark_sub_menu_model.cc ('k') | chrome/browser/ui/toolbar/wrench_menu_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698