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

Unified Diff: chrome/browser/ui/views/keyboard_overlay_dialog_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: Rebase 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/keyboard_overlay_dialog_view.h
diff --git a/chrome/browser/ui/views/keyboard_overlay_dialog_view.h b/chrome/browser/ui/views/keyboard_overlay_dialog_view.h
index ff0d95fe3362c7e09cd00a04b965b3b5c5126816..632c7083ca4e4fc778f73c6e234959037e84de3d 100644
--- a/chrome/browser/ui/views/keyboard_overlay_dialog_view.h
+++ b/chrome/browser/ui/views/keyboard_overlay_dialog_view.h
@@ -12,6 +12,10 @@
#include "chrome/browser/ui/webui/html_dialog_ui.h"
#include "chrome/browser/ui/views/html_dialog_view.h"
+namespace ui {
+class Accelerator;
+}
+
class BrowserView;
// A customized dialog view for the keyboard overlay.
@@ -23,7 +27,7 @@ class KeyboardOverlayDialogView : public HtmlDialogView {
virtual ~KeyboardOverlayDialogView();
// Overridden from views::View:
- virtual bool AcceleratorPressed(const views::Accelerator& accelerator);
+ virtual bool AcceleratorPressed(const ui::Accelerator& accelerator);
// Shows the keyboard overlay.
static void ShowDialog(gfx::NativeWindow owning_window, BrowserView* parent);
@@ -32,13 +36,13 @@ class KeyboardOverlayDialogView : public HtmlDialogView {
virtual void RegisterDialogAccelerators() OVERRIDE;
// Returns true if |accelerator| is an accelerator for closing the dialog.
- bool IsCloseAccelerator(const views::Accelerator& accelerator);
+ bool IsCloseAccelerator(const ui::Accelerator& accelerator);
// Points to the view from which this dialog is created.
BrowserView* parent_view_;
// Contains accelerators for closing this dialog.
- std::set<views::Accelerator> close_accelerators_;
+ std::set<ui::Accelerator> close_accelerators_;
DISALLOW_COPY_AND_ASSIGN(KeyboardOverlayDialogView);
};
« no previous file with comments | « chrome/browser/ui/views/js_modal_dialog_views.cc ('k') | chrome/browser/ui/views/keyboard_overlay_dialog_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698