OLD | NEW |
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/shell.h" | 5 #include "ash/shell.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "ash/app_list/app_list.h" | 9 #include "ash/app_list/app_list.h" |
10 #include "ash/ash_switches.h" | 10 #include "ash/ash_switches.h" |
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
338 SetupCompactWindowMode(); | 338 SetupCompactWindowMode(); |
339 else | 339 else |
340 SetupNonCompactWindowMode(); | 340 SetupNonCompactWindowMode(); |
341 | 341 |
342 if (!command_line->HasSwitch(switches::kAuraNoShadows)) | 342 if (!command_line->HasSwitch(switches::kAuraNoShadows)) |
343 shadow_controller_.reset(new internal::ShadowController()); | 343 shadow_controller_.reset(new internal::ShadowController()); |
344 | 344 |
345 focus_cycler_.reset(new internal::FocusCycler()); | 345 focus_cycler_.reset(new internal::FocusCycler()); |
346 focus_cycler_->AddWidget(status_widget_); | 346 focus_cycler_->AddWidget(status_widget_); |
347 focus_cycler_->AddWidget(launcher_->widget()); | 347 focus_cycler_->AddWidget(launcher_->widget()); |
| 348 launcher_->SetFocusCycler(focus_cycler_.get()); |
348 | 349 |
349 // Force a layout. | 350 // Force a layout. |
350 root_window->layout_manager()->OnWindowResized(); | 351 root_window->layout_manager()->OnWindowResized(); |
351 | 352 |
352 window_modality_controller_.reset(new internal::WindowModalityController); | 353 window_modality_controller_.reset(new internal::WindowModalityController); |
353 AddRootWindowEventFilter(window_modality_controller_.get()); | 354 AddRootWindowEventFilter(window_modality_controller_.get()); |
354 | 355 |
355 visibility_controller_.reset(new internal::VisibilityController); | 356 visibility_controller_.reset(new internal::VisibilityController); |
356 aura::client::SetVisibilityClient(visibility_controller_.get()); | 357 aura::client::SetVisibilityClient(visibility_controller_.get()); |
357 | 358 |
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
597 // Create the desktop background image. | 598 // Create the desktop background image. |
598 root_window_layout_->SetBackgroundWidget(internal::CreateDesktopBackground()); | 599 root_window_layout_->SetBackgroundWidget(internal::CreateDesktopBackground()); |
599 root_window_layout_->SetBackgroundLayer(NULL); | 600 root_window_layout_->SetBackgroundLayer(NULL); |
600 } | 601 } |
601 | 602 |
602 void Shell::ResetLayoutManager(int container_id) { | 603 void Shell::ResetLayoutManager(int container_id) { |
603 GetContainer(container_id)->SetLayoutManager(NULL); | 604 GetContainer(container_id)->SetLayoutManager(NULL); |
604 } | 605 } |
605 | 606 |
606 } // namespace ash | 607 } // namespace ash |
OLD | NEW |