diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-02 19:54:58 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-02 19:54:58 +0000 |
| commit | 0cc3dfe387313821853e658a6e2fb3b729eac9e5 (patch) | |
| tree | 6bdf4d23c62ae78cafc6e7c5a2599cce70dfef22 /chrome/browser/views/info_bubble.cc | |
| parent | 3c70591cc7d0d8cc162c10f7d3ac3b2ac15e4e69 (diff) | |
| download | chromium_src-0cc3dfe387313821853e658a6e2fb3b729eac9e5.zip chromium_src-0cc3dfe387313821853e658a6e2fb3b729eac9e5.tar.gz chromium_src-0cc3dfe387313821853e658a6e2fb3b729eac9e5.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/views/info_bubble.cc')
| -rw-r--r-- | chrome/browser/views/info_bubble.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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; |