| 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 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 319 SetupCompactWindowMode(); | 319 SetupCompactWindowMode(); |
| 320 else | 320 else |
| 321 SetupNonCompactWindowMode(); | 321 SetupNonCompactWindowMode(); |
| 322 | 322 |
| 323 if (!command_line->HasSwitch(switches::kAuraNoShadows)) | 323 if (!command_line->HasSwitch(switches::kAuraNoShadows)) |
| 324 shadow_controller_.reset(new internal::ShadowController()); | 324 shadow_controller_.reset(new internal::ShadowController()); |
| 325 | 325 |
| 326 focus_cycler_.reset(new internal::FocusCycler()); | 326 focus_cycler_.reset(new internal::FocusCycler()); |
| 327 focus_cycler_->AddWidget(status_widget_); | 327 focus_cycler_->AddWidget(status_widget_); |
| 328 focus_cycler_->AddWidget(launcher_->widget()); | 328 focus_cycler_->AddWidget(launcher_->widget()); |
| 329 launcher_->SetFocusCycler(focus_cycler_.get()); |
| 329 | 330 |
| 330 // Force a layout. | 331 // Force a layout. |
| 331 root_window->layout_manager()->OnWindowResized(); | 332 root_window->layout_manager()->OnWindowResized(); |
| 332 | 333 |
| 333 window_modality_controller_.reset(new internal::WindowModalityController); | 334 window_modality_controller_.reset(new internal::WindowModalityController); |
| 334 AddRootWindowEventFilter(window_modality_controller_.get()); | 335 AddRootWindowEventFilter(window_modality_controller_.get()); |
| 335 | 336 |
| 336 visibility_controller_.reset(new internal::VisibilityController); | 337 visibility_controller_.reset(new internal::VisibilityController); |
| 337 aura::client::SetVisibilityClient(visibility_controller_.get()); | 338 aura::client::SetVisibilityClient(visibility_controller_.get()); |
| 338 | 339 |
| (...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 578 // Create the desktop background image. | 579 // Create the desktop background image. |
| 579 root_window_layout_->SetBackgroundWidget(internal::CreateDesktopBackground()); | 580 root_window_layout_->SetBackgroundWidget(internal::CreateDesktopBackground()); |
| 580 root_window_layout_->SetBackgroundLayer(NULL); | 581 root_window_layout_->SetBackgroundLayer(NULL); |
| 581 } | 582 } |
| 582 | 583 |
| 583 void Shell::ResetLayoutManager(int container_id) { | 584 void Shell::ResetLayoutManager(int container_id) { |
| 584 GetContainer(container_id)->SetLayoutManager(NULL); | 585 GetContainer(container_id)->SetLayoutManager(NULL); |
| 585 } | 586 } |
| 586 | 587 |
| 587 } // namespace ash | 588 } // namespace ash |
| OLD | NEW |