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

Unified Diff: chrome/browser/ui/views/html_dialog_view.cc

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
« no previous file with comments | « chrome/browser/ui/views/html_dialog_view.h ('k') | chrome/browser/ui/views/js_modal_dialog_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/html_dialog_view.cc
diff --git a/chrome/browser/ui/views/html_dialog_view.cc b/chrome/browser/ui/views/html_dialog_view.cc
index a9ce20f40cdc2d3c3836c0f2b42adef8147434ac..d93100e2cfcb2eaf59bbe256c4df04a87153e8e6 100644
--- a/chrome/browser/ui/views/html_dialog_view.cc
+++ b/chrome/browser/ui/views/html_dialog_view.cc
@@ -69,7 +69,7 @@ gfx::Size HtmlDialogView::GetPreferredSize() {
return out;
}
-bool HtmlDialogView::AcceleratorPressed(const views::Accelerator& accelerator) {
+bool HtmlDialogView::AcceleratorPressed(const ui::Accelerator& accelerator) {
// Pressing ESC closes the dialog.
DCHECK_EQ(ui::VKEY_ESCAPE, accelerator.key_code());
OnDialogClosed(std::string());
@@ -257,7 +257,7 @@ void HtmlDialogView::InitDialog() {
void HtmlDialogView::RegisterDialogAccelerators() {
// Pressing the ESC key will close the dialog.
- AddAccelerator(views::Accelerator(ui::VKEY_ESCAPE, false, false, false));
+ AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, false, false, false));
}
void HtmlDialogView::OnRenderHostCreated(RenderViewHost* host) {
« no previous file with comments | « chrome/browser/ui/views/html_dialog_view.h ('k') | chrome/browser/ui/views/js_modal_dialog_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698