diff options
| author | bryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-03 00:38:27 +0000 |
|---|---|---|
| committer | bryeung@chromium.org <bryeung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-03 00:38:27 +0000 |
| commit | 7f05552488f8f9ea5000512fd1972894aee7ee82 (patch) | |
| tree | 0e2ed5a562335907e44307a1d99e9c6ab8d8a3ec /chrome/browser/views/dropdown_bar_host.cc | |
| parent | 9d7e8fd4a448491817b816585d6f375d71c0a97a (diff) | |
| download | chromium_src-7f05552488f8f9ea5000512fd1972894aee7ee82.zip chromium_src-7f05552488f8f9ea5000512fd1972894aee7ee82.tar.gz chromium_src-7f05552488f8f9ea5000512fd1972894aee7ee82.tar.bz2 | |
Re-lands 58186:
Original message:
"""
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=phajdan.jr@chromium.org
Review URL: http://codereview.chromium.org/3354005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58438 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/dropdown_bar_host.cc')
| -rw-r--r-- | chrome/browser/views/dropdown_bar_host.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/views/dropdown_bar_host.cc b/chrome/browser/views/dropdown_bar_host.cc index f756cb2..e55365b 100644 --- a/chrome/browser/views/dropdown_bar_host.cc +++ b/chrome/browser/views/dropdown_bar_host.cc @@ -4,8 +4,8 @@ #include "chrome/browser/views/dropdown_bar_host.h" +#include "app/keyboard_codes.h" #include "app/slide_animation.h" -#include "base/keyboard_codes.h" #include "base/scoped_handle.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_process.h" @@ -297,14 +297,14 @@ void DropdownBarHost::UpdateWindowEdges(const gfx::Rect& new_pos) { void DropdownBarHost::RegisterAccelerators() { DCHECK(!esc_accel_target_registered_); - views::Accelerator escape(base::VKEY_ESCAPE, false, false, false); + views::Accelerator escape(app::VKEY_ESCAPE, false, false, false); focus_manager_->RegisterAccelerator(escape, this); esc_accel_target_registered_ = true; } void DropdownBarHost::UnregisterAccelerators() { DCHECK(esc_accel_target_registered_); - views::Accelerator escape(base::VKEY_ESCAPE, false, false, false); + views::Accelerator escape(app::VKEY_ESCAPE, false, false, false); focus_manager_->UnregisterAccelerator(escape, this); esc_accel_target_registered_ = false; } |