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

Unified Diff: chrome/browser/ui/views/frame/browser_view.h

Issue 8508055: Move views::Accelerator to ui in order to use it from aura code. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 9 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/frame/browser_view.h
diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h
index beae7bbfd40ac87736c74bb8171ae16c58e0bd16..86ebb060c14b28cd6df1ff19f401cf184bb40072 100644
--- a/chrome/browser/ui/views/frame/browser_view.h
+++ b/chrome/browser/ui/views/frame/browser_view.h
@@ -162,7 +162,7 @@ class BrowserView : public BrowserBubbleHost,
virtual bool ShouldShowAvatar() const;
// Handle the specified |accelerator| being pressed.
- virtual bool AcceleratorPressed(const views::Accelerator& accelerator);
+ virtual bool AcceleratorPressed(const ui::Accelerator& accelerator);
// Provides the containing frame with the accelerator for the specified
// command id. This can be used to provide menu item shortcut hints etc.
@@ -551,7 +551,7 @@ class BrowserView : public BrowserBubbleHost,
// Possibly records a user metrics action corresponding to the passed-in
// accelerator. Only implemented for Chrome OS, where we're interested in
// learning about how frequently the top-row keys are used.
- void UpdateAcceleratorMetrics(const views::Accelerator& accelerator,
+ void UpdateAcceleratorMetrics(const ui::Accelerator& accelerator,
int command_id);
// Invoked from ActiveTabChanged or when instant is made active.
@@ -669,7 +669,7 @@ class BrowserView : public BrowserBubbleHost,
scoped_ptr<StatusBubbleViews> status_bubble_;
// A mapping between accelerators and commands.
- std::map<views::Accelerator, int> accelerator_table_;
+ std::map<ui::Accelerator, int> accelerator_table_;
// True if we have already been initialized.
bool initialized_;

Powered by Google App Engine
This is Rietveld 408576698