ui/aura/test/aura_test_helper.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/test/aura_test_helper.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/test/aura_test_helper.cc

diff --git a/ui/aura/test/aura_test_helper.cc b/ui/aura/test/aura_test_helper.cc

index 1b6ec92b61bc5bf8eb53e1ffc0a886eb41042d64..2e6e38913357d4935c4d631842640396b79da183 100644

--- a/ui/aura/test/aura_test_helper.cc

+++ b/ui/aura/test/aura_test_helper.cc

@@ -11,10 +11,10 @@

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

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

#include "ui/aura/env.h"

-#include "ui/aura/focus_manager.h"

#include "ui/aura/input_state_lookup.h"

#include "ui/aura/root_window.h"

#include "ui/aura/test/env_test_helper.h"

+#include "ui/aura/test/test_focus_client.h"

#include "ui/aura/test/test_screen.h"

#include "ui/aura/test/test_stacking_client.h"

#include "ui/base/ime/dummy_input_method.h"

@@ -77,7 +77,7 @@ void AuraTestHelper::SetUp() {

gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get());

root_window_.reset(test_screen_->CreateRootWindowForPrimaryDisplay());

- focus_client_.reset(new FocusManager);

+ focus_client_.reset(new TestFocusClient);

client::SetFocusClient(root_window_.get(), focus_client_.get());

stacking_client_.reset(new TestStackingClient(root_window_.get()));

activation_client_.reset(

« no previous file with comments | « ui/aura/root_window_unittest.cc ('k') | ui/aura/test/test_cursor_client.h » ('j') | no next file with comments »