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

Side by Side Diff: chrome/browser/ui/views/toolbar/wrench_menu.h

Issue 205153003: linux_aura: Don't inject black in WrenchMenu::GetForegroundColor(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sky rename request Created 6 years, 9 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_VIEWS_TOOLBAR_WRENCH_MENU_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_MENU_H_
6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_MENU_H_ 6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_MENU_H_
7 7
8 #include <map> 8 #include <map>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 53
54 const views::MenuConfig& GetMenuConfig() const; 54 const views::MenuConfig& GetMenuConfig() const;
55 55
56 bool use_new_menu() const { return use_new_menu_; } 56 bool use_new_menu() const { return use_new_menu_; }
57 57
58 void AddObserver(WrenchMenuObserver* observer); 58 void AddObserver(WrenchMenuObserver* observer);
59 void RemoveObserver(WrenchMenuObserver* observer); 59 void RemoveObserver(WrenchMenuObserver* observer);
60 60
61 // MenuDelegate overrides: 61 // MenuDelegate overrides:
62 virtual const gfx::FontList* GetLabelFontList(int command_id) const OVERRIDE; 62 virtual const gfx::FontList* GetLabelFontList(int command_id) const OVERRIDE;
63 virtual bool GetForegroundColor(int command_id, 63 virtual bool GetShouldUseDisabledEmphasizedForegroundColor(
64 bool is_hovered, 64 int command_id) const OVERRIDE;
65 SkColor* override_color) const OVERRIDE;
66 virtual base::string16 GetTooltipText(int command_id, 65 virtual base::string16 GetTooltipText(int command_id,
67 const gfx::Point& p) const OVERRIDE; 66 const gfx::Point& p) const OVERRIDE;
68 virtual bool IsTriggerableEvent(views::MenuItemView* menu, 67 virtual bool IsTriggerableEvent(views::MenuItemView* menu,
69 const ui::Event& e) OVERRIDE; 68 const ui::Event& e) OVERRIDE;
70 virtual bool GetDropFormats( 69 virtual bool GetDropFormats(
71 views::MenuItemView* menu, 70 views::MenuItemView* menu,
72 int* formats, 71 int* formats,
73 std::set<ui::OSExchangeData::CustomFormat>* custom_formats) OVERRIDE; 72 std::set<ui::OSExchangeData::CustomFormat>* custom_formats) OVERRIDE;
74 virtual bool AreDropTypesRequired(views::MenuItemView* menu) OVERRIDE; 73 virtual bool AreDropTypesRequired(views::MenuItemView* menu) OVERRIDE;
75 virtual bool CanDrop(views::MenuItemView* menu, 74 virtual bool CanDrop(views::MenuItemView* menu,
76 const ui::OSExchangeData& data) OVERRIDE; 75 const ui::OSExchangeData& data) OVERRIDE;
77 virtual int GetDropOperation(views::MenuItemView* item, 76 virtual int GetDropOperation(views::MenuItemView* item,
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 const bool use_new_menu_; 183 const bool use_new_menu_;
185 184
186 const bool supports_new_separators_; 185 const bool supports_new_separators_;
187 186
188 ObserverList<WrenchMenuObserver> observer_list_; 187 ObserverList<WrenchMenuObserver> observer_list_;
189 188
190 DISALLOW_COPY_AND_ASSIGN(WrenchMenu); 189 DISALLOW_COPY_AND_ASSIGN(WrenchMenu);
191 }; 190 };
192 191
193 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_MENU_H_ 192 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_MENU_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc ('k') | chrome/browser/ui/views/toolbar/wrench_menu.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698