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

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

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, 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 "chrome/browser/ui/gtk/browser_titlebar.h" 5 #include "chrome/browser/ui/gtk/browser_titlebar.h"
6 6
7 #include <gdk/gdkkeysyms.h> 7 #include <gdk/gdkkeysyms.h>
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 ui::SimpleMenuModel::Delegate* delegate, 169 ui::SimpleMenuModel::Delegate* delegate,
170 Browser* browser) 170 Browser* browser)
171 : ui::SimpleMenuModel(delegate), browser_(browser) { 171 : ui::SimpleMenuModel(delegate), browser_(browser) {
172 Build(); 172 Build();
173 } 173 }
174 174
175 void PopupPageMenuModel::Build() { 175 void PopupPageMenuModel::Build() {
176 AddItemWithStringId(IDC_BACK, IDS_CONTENT_CONTEXT_BACK); 176 AddItemWithStringId(IDC_BACK, IDS_CONTENT_CONTEXT_BACK);
177 AddItemWithStringId(IDC_FORWARD, IDS_CONTENT_CONTEXT_FORWARD); 177 AddItemWithStringId(IDC_FORWARD, IDS_CONTENT_CONTEXT_FORWARD);
178 AddItemWithStringId(IDC_RELOAD, IDS_APP_MENU_RELOAD); 178 AddItemWithStringId(IDC_RELOAD, IDS_APP_MENU_RELOAD);
179 AddSeparator(); 179 AddSeparator(ui::NORMAL_SEPARATOR);
180 AddItemWithStringId(IDC_SHOW_AS_TAB, IDS_SHOW_AS_TAB); 180 AddItemWithStringId(IDC_SHOW_AS_TAB, IDS_SHOW_AS_TAB);
181 AddSeparator(); 181 AddSeparator(ui::NORMAL_SEPARATOR);
182 AddItemWithStringId(IDC_CUT, IDS_CUT); 182 AddItemWithStringId(IDC_CUT, IDS_CUT);
183 AddItemWithStringId(IDC_COPY, IDS_COPY); 183 AddItemWithStringId(IDC_COPY, IDS_COPY);
184 AddItemWithStringId(IDC_PASTE, IDS_PASTE); 184 AddItemWithStringId(IDC_PASTE, IDS_PASTE);
185 AddSeparator(); 185 AddSeparator(ui::NORMAL_SEPARATOR);
186 AddItemWithStringId(IDC_FIND, IDS_FIND); 186 AddItemWithStringId(IDC_FIND, IDS_FIND);
187 AddItemWithStringId(IDC_PRINT, IDS_PRINT); 187 AddItemWithStringId(IDC_PRINT, IDS_PRINT);
188 zoom_menu_model_.reset(new ZoomMenuModel(delegate())); 188 zoom_menu_model_.reset(new ZoomMenuModel(delegate()));
189 AddSubMenuWithStringId(IDC_ZOOM_MENU, IDS_ZOOM_MENU, zoom_menu_model_.get()); 189 AddSubMenuWithStringId(IDC_ZOOM_MENU, IDS_ZOOM_MENU, zoom_menu_model_.get());
190 190
191 encoding_menu_model_.reset(new EncodingMenuModel(browser_)); 191 encoding_menu_model_.reset(new EncodingMenuModel(browser_));
192 AddSubMenuWithStringId(IDC_ENCODING_MENU, IDS_ENCODING_MENU, 192 AddSubMenuWithStringId(IDC_ENCODING_MENU, IDS_ENCODING_MENU,
193 encoding_menu_model_.get()); 193 encoding_menu_model_.get());
194 194
195 AddSeparator(); 195 AddSeparator(ui::NORMAL_SEPARATOR);
196 AddItemWithStringId(IDC_CLOSE_WINDOW, IDS_CLOSE); 196 AddItemWithStringId(IDC_CLOSE_WINDOW, IDS_CLOSE);
197 } 197 }
198 198
199 //////////////////////////////////////////////////////////////////////////////// 199 ////////////////////////////////////////////////////////////////////////////////
200 // BrowserTitlebar 200 // BrowserTitlebar
201 201
202 // static 202 // static
203 const char BrowserTitlebar::kDefaultButtonString[] = ":minimize,maximize,close"; 203 const char BrowserTitlebar::kDefaultButtonString[] = ":minimize,maximize,close";
204 204
205 BrowserTitlebar::BrowserTitlebar(BrowserWindowGtk* browser_window, 205 BrowserTitlebar::BrowserTitlebar(BrowserWindowGtk* browser_window,
(...skipping 835 matching lines...) Expand 10 before | Expand all | Expand 10 after
1041 1041
1042 AvatarMenuButtonGtk* BrowserTitlebar::avatar_button() const { 1042 AvatarMenuButtonGtk* BrowserTitlebar::avatar_button() const {
1043 return avatar_button_.get(); 1043 return avatar_button_.get();
1044 } 1044 }
1045 1045
1046 BrowserTitlebar::ContextMenuModel::ContextMenuModel( 1046 BrowserTitlebar::ContextMenuModel::ContextMenuModel(
1047 ui::SimpleMenuModel::Delegate* delegate) 1047 ui::SimpleMenuModel::Delegate* delegate)
1048 : SimpleMenuModel(delegate) { 1048 : SimpleMenuModel(delegate) {
1049 AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB); 1049 AddItemWithStringId(IDC_NEW_TAB, IDS_TAB_CXMENU_NEWTAB);
1050 AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB); 1050 AddItemWithStringId(IDC_RESTORE_TAB, IDS_RESTORE_TAB);
1051 AddSeparator(); 1051 AddSeparator(ui::NORMAL_SEPARATOR);
1052 AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); 1052 AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
1053 AddSeparator(); 1053 AddSeparator(ui::NORMAL_SEPARATOR);
1054 AddCheckItemWithStringId(kShowWindowDecorationsCommand, 1054 AddCheckItemWithStringId(kShowWindowDecorationsCommand,
1055 IDS_SHOW_WINDOW_DECORATIONS_MENU); 1055 IDS_SHOW_WINDOW_DECORATIONS_MENU);
1056 } 1056 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/gtk/bookmarks/bookmark_sub_menu_model_gtk.cc ('k') | chrome/browser/ui/tabs/tab_menu_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698