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

diff --git a/ash/shell.cc b/ash/shell.cc

index 83afc255dd8502554fff0d05ab92144d606f4f7b..9a93d18f60e9caf49884c06e22bf3d5c00d0f24b 100644

--- a/ash/shell.cc

+++ b/ash/shell.cc

@@ -58,7 +58,6 @@

#include "ash/wm/window_modality_controller.h"

#include "ash/wm/window_properties.h"

#include "ash/wm/window_util.h"

-#include "ash/wm/workspace/workspace_layout_manager.h"

#include "ash/wm/workspace_controller.h"

#include "base/bind.h"

#include "base/command_line.h"

@@ -739,8 +738,7 @@ void Shell::InitRootWindowController(

// the extended desktop is enabled by default.

internal::AlwaysOnTopController* always_on_top_controller =

new internal::AlwaysOnTopController;

- always_on_top_controller->SetContainers(

- root_window->GetChildById(internal::kShellWindowId_DefaultContainer),

+ always_on_top_controller->SetAlwaysOnTopContainer(

root_window->GetChildById(internal::kShellWindowId_AlwaysOnTopContainer));

root_window->SetProperty(internal::kAlwaysOnTopControllerKey,

always_on_top_controller);

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