athena/wm/window_manager_impl.cc - Issue 404563002: Athena's FocusRules

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: athena/wm/window_manager_impl.cc

Issue 404563002: Athena's FocusRules (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 5 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: athena/wm/window_manager_impl.cc

diff --git a/athena/wm/window_manager_impl.cc b/athena/wm/window_manager_impl.cc

index 736d638067c9175c4efb8eb5b1ddd538854ea226..37e7dcee736519c054e369e4ee286096a19ae6ca 100644

--- a/athena/wm/window_manager_impl.cc

+++ b/athena/wm/window_manager_impl.cc

@@ -127,9 +127,10 @@ class AthenaContainerLayoutManager : public aura::LayoutManager {

DISALLOW_COPY_AND_ASSIGN(AthenaContainerLayoutManager);

};

-WindowManagerImpl::WindowManagerImpl()

- : container_(

- ScreenManager::Get()->CreateDefaultContainer("MainContainer")) {

+WindowManagerImpl::WindowManagerImpl() {

+ ScreenManager::ContainerParams params("DefaultContainer");

+ params.can_activate_children = true;

+ container_.reset(ScreenManager::Get()->CreateDefaultContainer(params));

container_->SetLayoutManager(new AthenaContainerLayoutManager);

container_->AddObserver(this);

instance = this;