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

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h

Issue 11030017: Add context to gfx::Screen calls in support of simultaneous desktop+ash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix some new gfx::Screen additions Created 8 years, 2 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_VIEWS_BOOKMARKS_BOOKMARK_MENU_DELEGATE_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_DELEGATE_H_
6 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_DELEGATE_H_ 6 #define CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_DELEGATE_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 10
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 // Returns the menu. 77 // Returns the menu.
78 views::MenuItemView* menu() const { return menu_; } 78 views::MenuItemView* menu() const { return menu_; }
79 79
80 // Returns the context menu, or NULL if the context menu isn't showing. 80 // Returns the context menu, or NULL if the context menu isn't showing.
81 views::MenuItemView* context_menu() const { 81 views::MenuItemView* context_menu() const {
82 return context_menu_.get() ? context_menu_->menu() : NULL; 82 return context_menu_.get() ? context_menu_->menu() : NULL;
83 } 83 }
84 84
85 Profile* profile() { return profile_; } 85 Profile* profile() { return profile_; }
86 86
87 views::Widget* parent() { return parent_; } 87 views::Widget* parent() const { return parent_; }
oshima 2012/10/10 17:58:23 const method should return const reference. If you
scottmg 2012/10/10 19:04:47 Done.
88 88
89 // Returns true if we're in the process of mutating the model. This happens 89 // Returns true if we're in the process of mutating the model. This happens
90 // when the user deletes menu items using the context menu. 90 // when the user deletes menu items using the context menu.
91 bool is_mutating_model() const { return is_mutating_model_; } 91 bool is_mutating_model() const { return is_mutating_model_; }
92 92
93 // MenuDelegate like methods (see class description for details). 93 // MenuDelegate like methods (see class description for details).
94 string16 GetTooltipText(int id, const gfx::Point& p) const; 94 string16 GetTooltipText(int id, const gfx::Point& p) const;
95 bool IsTriggerableEvent(views::MenuItemView* menu, 95 bool IsTriggerableEvent(views::MenuItemView* menu,
96 const ui::Event& e); 96 const ui::Event& e);
97 void ExecuteCommand(int id, int mouse_event_flags); 97 void ExecuteCommand(int id, int mouse_event_flags);
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 // Is the model being changed? 202 // Is the model being changed?
203 bool is_mutating_model_; 203 bool is_mutating_model_;
204 204
205 // The location where this bookmark menu will be displayed (for UMA). 205 // The location where this bookmark menu will be displayed (for UMA).
206 bookmark_utils::BookmarkLaunchLocation location_; 206 bookmark_utils::BookmarkLaunchLocation location_;
207 207
208 DISALLOW_COPY_AND_ASSIGN(BookmarkMenuDelegate); 208 DISALLOW_COPY_AND_ASSIGN(BookmarkMenuDelegate);
209 }; 209 };
210 210
211 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_DELEGATE_H_ 211 #endif // CHROME_BROWSER_UI_VIEWS_BOOKMARKS_BOOKMARK_MENU_DELEGATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698