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

Unified Diff: chrome/browser/ui/views/bubble/bubble.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
« no previous file with comments | « no previous file | chrome/browser/ui/views/bubble/bubble.cc » ('j') | views/accelerator.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/bubble/bubble.h
diff --git a/chrome/browser/ui/views/bubble/bubble.h b/chrome/browser/ui/views/bubble/bubble.h
index b6093d1eb30128e1c1047c25f27cce4846d07d52..91586a431e47b831e2a5c319b374d1a2a576d1a8 100644
--- a/chrome/browser/ui/views/bubble/bubble.h
+++ b/chrome/browser/ui/views/bubble/bubble.h
@@ -87,7 +87,7 @@ class Bubble
#elif defined(TOOLKIT_USES_GTK)
: public views::NativeWidgetGtk,
#endif
- public views::AcceleratorTarget,
+ public ui::AcceleratorTarget,
public ui::AnimationDelegate {
public:
class Observer {
@@ -236,7 +236,7 @@ class Bubble
void UnregisterEscapeAccelerator();
// Overridden from AcceleratorTarget:
- virtual bool AcceleratorPressed(const views::Accelerator& accelerator);
+ virtual bool AcceleratorPressed(const ui::Accelerator& accelerator);
// The delegate, if any.
BubbleDelegate* delegate_;
« no previous file with comments | « no previous file | chrome/browser/ui/views/bubble/bubble.cc » ('j') | views/accelerator.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698