diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-18 22:07:34 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-18 22:07:34 +0000 |
| commit | 980969549b2d830274e99d8919d6bb2fa0d82b5e (patch) | |
| tree | f45d0ba2f57b6c2bbd0dc52417664d0e7ac3d38a /ui/aura/bench | |
| parent | 145e5a1d4494df83036fa4a6f81fd5bf3adbcf90 (diff) | |
| download | chromium_src-980969549b2d830274e99d8919d6bb2fa0d82b5e.zip chromium_src-980969549b2d830274e99d8919d6bb2fa0d82b5e.tar.gz chromium_src-980969549b2d830274e99d8919d6bb2fa0d82b5e.tar.bz2 | |
Attempt to re-land FocusManager removal from Aura.
content_browsertests ContentWindowReparent test was failing, presumably because a focus notification wasn't being broadcast by the new test focus client.
R=sky@chromium.org
BUG=
Review URL: https://codereview.chromium.org/29883002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229480 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/aura/bench')
| -rw-r--r-- | ui/aura/bench/bench_main.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/aura/bench/bench_main.cc b/ui/aura/bench/bench_main.cc index a93bc1f..67ba3a6 100644 --- a/ui/aura/bench/bench_main.cc +++ b/ui/aura/bench/bench_main.cc @@ -15,8 +15,8 @@ #include "third_party/skia/include/core/SkXfermode.h" #include "ui/aura/client/default_capture_client.h" #include "ui/aura/env.h" -#include "ui/aura/focus_manager.h" #include "ui/aura/root_window.h" +#include "ui/aura/test/test_focus_client.h" #include "ui/aura/test/test_screen.h" #include "ui/aura/window.h" #include "ui/base/hit_test.h" @@ -318,7 +318,8 @@ int main(int argc, char** argv) { root_window.get(), new aura::client::DefaultCaptureClient(root_window.get())); - scoped_ptr<aura::client::FocusClient> focus_client(new aura::FocusManager); + scoped_ptr<aura::client::FocusClient> focus_client( + new aura::test::TestFocusClient); aura::client::SetFocusClient(root_window.get(), focus_client.get()); // add layers |