From 0cc3dfe387313821853e658a6e2fb3b729eac9e5 Mon Sep 17 00:00:00 2001 From: "akalin@chromium.org" Date: Thu, 2 Sep 2010 19:54:58 +0000 Subject: Revert 58388 - Revert 58215 - Revert 58186 - Move the keyboard files from base/ to app/. Also moves the associated classes/enums from base:: to app::. TEST=try bots compile BUG=NONE Review URL: http://codereview.chromium.org/3165064 TBR=bryeung@chromium.org TBR=phajdan.jr@chromium.org Review URL: http://codereview.chromium.org/3361003 TBR=bryeung@chromium.org Review URL: http://codereview.chromium.org/3337006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58390 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/views/info_bubble.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'chrome/browser/views/info_bubble.cc') diff --git a/chrome/browser/views/info_bubble.cc b/chrome/browser/views/info_bubble.cc index 3ee1317..48b7626 100644 --- a/chrome/browser/views/info_bubble.cc +++ b/chrome/browser/views/info_bubble.cc @@ -4,7 +4,7 @@ #include "chrome/browser/views/info_bubble.h" -#include "app/keyboard_codes.h" +#include "base/keyboard_codes.h" #include "chrome/browser/window_sizer.h" #include "chrome/common/notification_service.h" #include "gfx/canvas_skia.h" @@ -426,7 +426,7 @@ void InfoBubble::Init(views::Widget* parent, // Register the Escape accelerator for closing. GetFocusManager()->RegisterAccelerator( - views::Accelerator(app::VKEY_ESCAPE, false, false, false), this); + views::Accelerator(base::VKEY_ESCAPE, false, false, false), this); // Done creating the bubble. NotificationService::current()->Notify(NotificationType::INFO_BUBBLE_CREATED, @@ -491,7 +491,7 @@ void InfoBubble::DoClose(bool closed_by_escape) { return; GetFocusManager()->UnregisterAccelerator( - views::Accelerator(app::VKEY_ESCAPE, false, false, false), this); + views::Accelerator(base::VKEY_ESCAPE, false, false, false), this); if (delegate_) delegate_->InfoBubbleClosing(this, closed_by_escape); show_status_ = kClosed; -- cgit v1.1