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

Side by Side Diff: chrome/browser/ui/gtk/menu_gtk.h

Issue 10855075: Clean-up inline members of nested classes (chrome/) (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
« no previous file with comments | « chrome/browser/task_manager/task_manager.cc ('k') | chrome/browser/ui/gtk/menu_gtk.cc » ('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) 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_GTK_MENU_GTK_H_ 5 #ifndef CHROME_BROWSER_UI_GTK_MENU_GTK_H_
6 #define CHROME_BROWSER_UI_GTK_MENU_GTK_H_ 6 #define CHROME_BROWSER_UI_GTK_MENU_GTK_H_
7 7
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 9
10 #include <string> 10 #include <string>
(...skipping 25 matching lines...) Expand all
36 // the menu and/or the delegate. 36 // the menu and/or the delegate.
37 virtual void CommandWillBeExecuted() {} 37 virtual void CommandWillBeExecuted() {}
38 38
39 // Called when the menu stops showing. This will be called before 39 // Called when the menu stops showing. This will be called before
40 // ExecuteCommand if the user clicks an item, but will also be called when 40 // ExecuteCommand if the user clicks an item, but will also be called when
41 // the user clicks away from the menu. 41 // the user clicks away from the menu.
42 virtual void StoppedShowing() {} 42 virtual void StoppedShowing() {}
43 43
44 // Return true if we should override the "gtk-menu-images" system setting 44 // Return true if we should override the "gtk-menu-images" system setting
45 // when showing image menu items for this menu. 45 // when showing image menu items for this menu.
46 virtual bool AlwaysShowIconForCmd(int command_id) const { return false; } 46 virtual bool AlwaysShowIconForCmd(int command_id) const;
47 47
48 // Returns a tinted image used in button in a menu. 48 // Returns a tinted image used in button in a menu.
49 virtual GtkIconSet* GetIconSetForId(int idr) { return NULL; } 49 virtual GtkIconSet* GetIconSetForId(int idr);
50 50
51 // Returns an icon for the menu item, if available. 51 // Returns an icon for the menu item, if available.
52 virtual GtkWidget* GetImageForCommandId(int command_id) const; 52 virtual GtkWidget* GetImageForCommandId(int command_id) const;
53 53
54 static GtkWidget* GetDefaultImageForCommandId(int command_id); 54 static GtkWidget* GetDefaultImageForCommandId(int command_id);
55 }; 55 };
56 56
57 MenuGtk(MenuGtk::Delegate* delegate, ui::MenuModel* model); 57 MenuGtk(MenuGtk::Delegate* delegate, ui::MenuModel* model);
58 virtual ~MenuGtk(); 58 virtual ~MenuGtk();
59 59
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 // menu items from getting activated when we are setting up the 199 // menu items from getting activated when we are setting up the
200 // menu. 200 // menu.
201 static bool block_activation_; 201 static bool block_activation_;
202 202
203 ui::GtkSignalRegistrar signal_; 203 ui::GtkSignalRegistrar signal_;
204 204
205 base::WeakPtrFactory<MenuGtk> weak_factory_; 205 base::WeakPtrFactory<MenuGtk> weak_factory_;
206 }; 206 };
207 207
208 #endif // CHROME_BROWSER_UI_GTK_MENU_GTK_H_ 208 #endif // CHROME_BROWSER_UI_GTK_MENU_GTK_H_
OLDNEW
« no previous file with comments | « chrome/browser/task_manager/task_manager.cc ('k') | chrome/browser/ui/gtk/menu_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698