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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.h

Issue 13044014: Make sure manifest specified shortcut for Extension Command can not override the built-in shortcuts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Mac's secondary shortcuts can be overwritten Created 7 years, 8 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
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_FRAME_BROWSER_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
7 7
8 #include <map> 8 #include <map>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 181
182 // Handle the specified |accelerator| being pressed. 182 // Handle the specified |accelerator| being pressed.
183 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE; 183 virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
184 184
185 // Provides the containing frame with the accelerator for the specified 185 // Provides the containing frame with the accelerator for the specified
186 // command id. This can be used to provide menu item shortcut hints etc. 186 // command id. This can be used to provide menu item shortcut hints etc.
187 // Returns true if an accelerator was found for the specified |cmd_id|, false 187 // Returns true if an accelerator was found for the specified |cmd_id|, false
188 // otherwise. 188 // otherwise.
189 bool GetAccelerator(int cmd_id, ui::Accelerator* accelerator); 189 bool GetAccelerator(int cmd_id, ui::Accelerator* accelerator);
190 190
191 // Returns true if the specificed |accelerator| is registered with this view.
192 bool IsAcceleratorRegistered(const ui::Accelerator& accelerator);
193
191 // Returns the active WebContents. Used by our NonClientView's 194 // Returns the active WebContents. Used by our NonClientView's
192 // TabIconView::TabContentsProvider implementations. 195 // TabIconView::TabContentsProvider implementations.
193 // TODO(beng): exposing this here is a bit bogus, since it's only used to 196 // TODO(beng): exposing this here is a bit bogus, since it's only used to
194 // determine loading state. It'd be nicer if we could change this to be 197 // determine loading state. It'd be nicer if we could change this to be
195 // bool IsSelectedTabLoading() const; or something like that. We could even 198 // bool IsSelectedTabLoading() const; or something like that. We could even
196 // move it to a WindowDelegate subclass. 199 // move it to a WindowDelegate subclass.
197 content::WebContents* GetActiveWebContents() const; 200 content::WebContents* GetActiveWebContents() const;
198 201
199 // Retrieves the icon to use in the frame to indicate an OTR window. 202 // Retrieves the icon to use in the frame to indicate an OTR window.
200 gfx::ImageSkia GetOTRAvatarIcon() const; 203 gfx::ImageSkia GetOTRAvatarIcon() const;
(...skipping 547 matching lines...) Expand 10 before | Expand all | Expand 10 after
748 gfx::ScopedSysColorChangeListener color_change_listener_; 751 gfx::ScopedSysColorChangeListener color_change_listener_;
749 752
750 scoped_ptr<InstantOverlayControllerViews> overlay_controller_; 753 scoped_ptr<InstantOverlayControllerViews> overlay_controller_;
751 754
752 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_; 755 mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
753 756
754 DISALLOW_COPY_AND_ASSIGN(BrowserView); 757 DISALLOW_COPY_AND_ASSIGN(BrowserView);
755 }; 758 };
756 759
757 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 760 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/accelerator_utils_views.cc ('k') | chrome/browser/ui/views/frame/browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698