Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Unified Diff: ui/aura/bench/bench_main.cc

Issue 29883002: Attempt to re-land FocusManager removal from Aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Disable test with note. Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/aura/client/focus_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/bench/bench_main.cc
diff --git a/ui/aura/bench/bench_main.cc b/ui/aura/bench/bench_main.cc
index a93bc1f177132bc7cbc178b79738441eeb10120a..67ba3a62b099db89ab234fd7764c50c3f25798a7 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
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/aura/client/focus_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698