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

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

Issue 6246001: Move app/key* to ui/base/keycodes/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/fullscreen_exit_bubble.cc ('k') | chrome/browser/ui/views/info_bubble.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
===================================================================
--- chrome/browser/ui/views/html_dialog_view.cc (revision 71220)
+++ chrome/browser/ui/views/html_dialog_view.cc (working copy)
@@ -4,11 +4,11 @@
#include "chrome/browser/ui/views/html_dialog_view.h"
-#include "app/keyboard_codes.h"
#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/views/window.h"
#include "chrome/common/native_web_keyboard_event.h"
+#include "ui/base/keycodes/keyboard_codes.h"
#include "views/widget/root_view.h"
#include "views/widget/widget.h"
#include "views/window/window.h"
@@ -56,7 +56,7 @@
bool HtmlDialogView::AcceleratorPressed(const views::Accelerator& accelerator) {
// Pressing ESC closes the dialog.
- DCHECK_EQ(app::VKEY_ESCAPE, accelerator.GetKeyCode());
+ DCHECK_EQ(ui::VKEY_ESCAPE, accelerator.GetKeyCode());
OnDialogClosed(std::string());
return true;
}
@@ -214,7 +214,7 @@
this);
// Pressing the ESC key will close the dialog.
- AddAccelerator(views::Accelerator(app::VKEY_ESCAPE, false, false, false));
+ AddAccelerator(views::Accelerator(ui::VKEY_ESCAPE, false, false, false));
DOMView::LoadURL(GetDialogContentURL());
}
« no previous file with comments | « chrome/browser/ui/views/fullscreen_exit_bubble.cc ('k') | chrome/browser/ui/views/info_bubble.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698