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/find_bar_host_browsertest.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/find_bar_host_browsertest.cc')
| -rw-r--r-- | chrome/browser/find_bar_host_browsertest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/find_bar_host_browsertest.cc b/chrome/browser/find_bar_host_browsertest.cc index e5f7068..d68e35d 100644 --- a/chrome/browser/find_bar_host_browsertest.cc +++ b/chrome/browser/find_bar_host_browsertest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/keyboard_codes.h" +#include "base/keyboard_codes.h" #include "base/message_loop.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -721,7 +721,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, browser()->window()->GetNativeHandle()); // See where Escape is registered. - views::Accelerator escape(app::VKEY_ESCAPE, false, false, false); + views::Accelerator escape(base::VKEY_ESCAPE, false, false, false); views::AcceleratorTarget* old_target = focus_manager->GetCurrentTargetForAccelerator(escape); EXPECT_TRUE(old_target != NULL); |