ui/aura/demo/demo_main.cc - Issue 29883002: Attempt to re-land FocusManager removal from Aura.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/aura/demo/demo_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:

Index: ui/aura/demo/demo_main.cc

diff --git a/ui/aura/demo/demo_main.cc b/ui/aura/demo/demo_main.cc

index e56ab714677c794f139d34bd348169347e650655..abdd514c95eb37804be924b957d070e9e2b4c284 100644

--- a/ui/aura/demo/demo_main.cc

+++ b/ui/aura/demo/demo_main.cc

@@ -11,8 +11,8 @@

#include "ui/aura/client/default_capture_client.h"

#include "ui/aura/client/stacking_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/aura/window_delegate.h"

@@ -122,8 +122,8 @@ int DemoMain() {

test_screen->CreateRootWindowForPrimaryDisplay());

scoped_ptr<DemoStackingClient> stacking_client(new DemoStackingClient(

root_window.get()));

- aura::FocusManager focus_manager;

- aura::client::SetFocusClient(root_window.get(), &focus_manager);

+ aura::test::TestFocusClient focus_client;

+ aura::client::SetFocusClient(root_window.get(), &focus_client);

// Create a hierarchy of test windows.

DemoWindowDelegate window_delegate1(SK_ColorBLUE);

« no previous file with comments | « ui/aura/client/focus_client.h ('k') | ui/aura/focus_manager.h » ('j') | no next file with comments »