ash/root_window_controller_unittest.cc - Issue 11299219: Rework FocusManager as FocusClient.

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: ash/root_window_controller_unittest.cc

Issue 11299219: Rework FocusManager as FocusClient. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 1 month 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: ash/root_window_controller_unittest.cc

===================================================================

--- ash/root_window_controller_unittest.cc (revision 169818)

+++ ash/root_window_controller_unittest.cc (working copy)

@@ -12,8 +12,8 @@

#include "ash/test/ash_test_base.h"

#include "ash/wm/system_modal_container_layout_manager.h"

#include "ash/wm/window_util.h"

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

#include "ui/aura/env.h"

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

#include "ui/aura/root_window.h"

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

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

@@ -150,8 +150,7 @@

aura::Window* d2 = aura::test::CreateTestWindowWithDelegate(

&delete_on_blur_delegate, 0, gfx::Rect(50, 50, 100, 100), NULL);

delete_on_blur_delegate.set_window(d2);

- root_windows[0]->GetFocusManager()->SetFocusedWindow(

- d2, NULL);

+ aura::client::GetFocusClient(root_windows[0])->FocusWindow(d2, NULL);

tracker.Add(d2);

UpdateDisplay("600x600");

« no previous file with comments | « ash/root_window_controller.cc ('k') | ash/shell.h » ('j') | no next file with comments »