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

Side by Side Diff: ash/root_window_controller.cc

Issue 14756019: Adding new user menu section to the SystemTrayMenu & refactoring of user access (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More windows breakages addressed Created 7 years, 7 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
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/root_window_controller.h" 5 #include "ash/root_window_controller.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/ash_constants.h" 9 #include "ash/ash_constants.h"
10 #include "ash/ash_switches.h" 10 #include "ash/ash_switches.h"
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 274
275 // Create Panel layout manager 275 // Create Panel layout manager
276 aura::Window* panel_container = GetContainer( 276 aura::Window* panel_container = GetContainer(
277 internal::kShellWindowId_PanelContainer); 277 internal::kShellWindowId_PanelContainer);
278 panel_layout_manager_ = 278 panel_layout_manager_ =
279 new internal::PanelLayoutManager(panel_container); 279 new internal::PanelLayoutManager(panel_container);
280 panel_container_handler_.reset( 280 panel_container_handler_.reset(
281 new ToplevelWindowEventHandler(panel_container)); 281 new ToplevelWindowEventHandler(panel_container));
282 panel_container->SetLayoutManager(panel_layout_manager_); 282 panel_container->SetLayoutManager(panel_layout_manager_);
283 283
284 if (Shell::GetInstance()->session_state_delegate()->HasActiveUser()) 284 if (Shell::GetInstance()->session_state_delegate()->NumberOfLoggedInUsers())
285 shelf_->CreateLauncher(); 285 shelf_->CreateLauncher();
286 286
287 InitKeyboard(); 287 InitKeyboard();
288 } 288 }
289 289
290 void RootWindowController::CreateContainers() { 290 void RootWindowController::CreateContainers() {
291 CreateContainersInRootWindow(root_window_.get()); 291 CreateContainersInRootWindow(root_window_.get());
292 292
293 // Create touch observer HUD if needed. HUD should be created after the 293 // Create touch observer HUD if needed. HUD should be created after the
294 // containers have been created, so that its widget can be added to them. 294 // containers have been created, so that its widget can be added to them.
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 "OverlayContainer", 623 "OverlayContainer",
624 lock_screen_related_containers); 624 lock_screen_related_containers);
625 SetUsesScreenCoordinates(overlay_container); 625 SetUsesScreenCoordinates(overlay_container);
626 626
627 CreateContainer(kShellWindowId_PowerButtonAnimationContainer, 627 CreateContainer(kShellWindowId_PowerButtonAnimationContainer,
628 "PowerButtonAnimationContainer", root_window) ; 628 "PowerButtonAnimationContainer", root_window) ;
629 } 629 }
630 630
631 } // namespace internal 631 } // namespace internal
632 } // namespace ash 632 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698