Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(155)

Side by Side Diff: ash/wm/stacking_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:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/wm/shelf_layout_manager.cc ('k') | ash/wm/window_animations.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/wm/stacking_controller.h" 5 #include "ash/wm/stacking_controller.h"
6 6
7 #include "ash/display/display_controller.h" 7 #include "ash/display/display_controller.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/shell_window_ids.h" 9 #include "ash/shell_window_ids.h"
10 #include "ash/wm/always_on_top_controller.h" 10 #include "ash/wm/always_on_top_controller.h"
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 return container; 136 return container;
137 } 137 }
138 138
139 // TODO(oshima): Remove this once extended desktop is on by default. 139 // TODO(oshima): Remove this once extended desktop is on by default.
140 internal::AlwaysOnTopController* 140 internal::AlwaysOnTopController*
141 StackingController::GetAlwaysOnTopController(aura::RootWindow* root_window) { 141 StackingController::GetAlwaysOnTopController(aura::RootWindow* root_window) {
142 internal::AlwaysOnTopController* controller = 142 internal::AlwaysOnTopController* controller =
143 root_window->GetProperty(internal::kAlwaysOnTopControllerKey); 143 root_window->GetProperty(internal::kAlwaysOnTopControllerKey);
144 if (!controller) { 144 if (!controller) {
145 controller = new internal::AlwaysOnTopController; 145 controller = new internal::AlwaysOnTopController;
146 controller->SetContainers( 146 controller->SetAlwaysOnTopContainer(
147 root_window->GetChildById(internal::kShellWindowId_DefaultContainer),
148 root_window->GetChildById( 147 root_window->GetChildById(
149 internal::kShellWindowId_AlwaysOnTopContainer)); 148 internal::kShellWindowId_AlwaysOnTopContainer));
150 // RootWindow owns the AlwaysOnTopController object. 149 // RootWindow owns the AlwaysOnTopController object.
151 root_window->SetProperty(kAlwaysOnTopControllerKey, controller); 150 root_window->SetProperty(kAlwaysOnTopControllerKey, controller);
152 } 151 }
153 return controller; 152 return controller;
154 } 153 }
155 154
156 } // namespace internal 155 } // namespace internal
157 } // namespace ash 156 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/shelf_layout_manager.cc ('k') | ash/wm/window_animations.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698