ash/wm/window_cycle_controller.cc - Issue 11201002: Removes worskpace 1 code. Will rename next.

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/wm/window_cycle_controller.cc

Issue 11201002: Removes worskpace 1 code. Will rename next. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove constants and add back kDisableLoginAnimations Created 8 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: ash/wm/window_cycle_controller.cc

diff --git a/ash/wm/window_cycle_controller.cc b/ash/wm/window_cycle_controller.cc

index ac171b5f864eaf551a244bbb5a9852de702efd1a..7568f152f825f3588571ce674fb4b4062a343e3a 100644

--- a/ash/wm/window_cycle_controller.cc

+++ b/ash/wm/window_cycle_controller.cc

@@ -105,12 +105,10 @@ void AddCycleWindows(aura::RootWindow* root,

int container_id,

WindowCycleList::WindowList* windows) {

aura::Window* container = Shell::GetContainer(root, container_id);

- if (container_id == internal::kShellWindowId_DefaultContainer &&

- internal::WorkspaceController::IsWorkspace2Enabled()) {

+ if (container_id == internal::kShellWindowId_DefaultContainer)

AddWorkspace2Children(container, windows);

- } else {

+ else

AddAllChildren(container, windows);

- }

}

} // namespace

« no previous file with comments | « ash/wm/window_animations_unittest.cc ('k') | ash/wm/workspace/base_workspace_manager.h » ('j') | no next file with comments »