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

Unified Diff: chrome/browser/views/info_bubble.cc

Issue 3361003: Revert 58215 - Revert 58186 - Move the keyboard files from base/ to app/.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 4 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/views/html_dialog_view.cc ('k') | chrome/browser/views/jsmessage_box_dialog.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/info_bubble.cc
===================================================================
--- chrome/browser/views/info_bubble.cc (revision 58386)
+++ chrome/browser/views/info_bubble.cc (working copy)
@@ -4,7 +4,7 @@
#include "chrome/browser/views/info_bubble.h"
-#include "base/keyboard_codes.h"
+#include "app/keyboard_codes.h"
#include "chrome/browser/window_sizer.h"
#include "chrome/common/notification_service.h"
#include "gfx/canvas_skia.h"
@@ -426,7 +426,7 @@
// Register the Escape accelerator for closing.
GetFocusManager()->RegisterAccelerator(
- views::Accelerator(base::VKEY_ESCAPE, false, false, false), this);
+ views::Accelerator(app::VKEY_ESCAPE, false, false, false), this);
// Done creating the bubble.
NotificationService::current()->Notify(NotificationType::INFO_BUBBLE_CREATED,
@@ -491,7 +491,7 @@
return;
GetFocusManager()->UnregisterAccelerator(
- views::Accelerator(base::VKEY_ESCAPE, false, false, false), this);
+ views::Accelerator(app::VKEY_ESCAPE, false, false, false), this);
if (delegate_)
delegate_->InfoBubbleClosing(this, closed_by_escape);
show_status_ = kClosed;
« no previous file with comments | « chrome/browser/views/html_dialog_view.cc ('k') | chrome/browser/views/jsmessage_box_dialog.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698