| 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/accelerators/accelerator_controller.h" | 5 #include "ash/accelerators/accelerator_controller.h" |
| 6 | 6 |
| 7 #include "ash/accelerators/accelerator_table.h" | 7 #include "ash/accelerators/accelerator_table.h" |
| 8 #include "ash/ash_switches.h" | 8 #include "ash/ash_switches.h" |
| 9 #include "ash/caps_lock_delegate.h" | 9 #include "ash/caps_lock_delegate.h" |
| 10 #include "ash/desktop_background/desktop_background_controller.h" | 10 #include "ash/desktop_background/desktop_background_controller.h" |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 149 ash::Shell::GetPrimaryRootWindow()->layer()->GetAnimator()->StartAnimation( | 149 ash::Shell::GetPrimaryRootWindow()->layer()->GetAnimator()->StartAnimation( |
| 150 screen_rotation.release()); | 150 screen_rotation.release()); |
| 151 return true; | 151 return true; |
| 152 } | 152 } |
| 153 | 153 |
| 154 bool HandleToggleDesktopBackgroundMode() { | 154 bool HandleToggleDesktopBackgroundMode() { |
| 155 ash::DesktopBackgroundController* desktop_background_controller = | 155 ash::DesktopBackgroundController* desktop_background_controller = |
| 156 ash::Shell::GetInstance()->desktop_background_controller(); | 156 ash::Shell::GetInstance()->desktop_background_controller(); |
| 157 if (desktop_background_controller->desktop_background_mode() == | 157 if (desktop_background_controller->desktop_background_mode() == |
| 158 ash::DesktopBackgroundController::BACKGROUND_IMAGE) { | 158 ash::DesktopBackgroundController::BACKGROUND_IMAGE) { |
| 159 desktop_background_controller->SetDesktopBackgroundSolidColorMode(); | 159 desktop_background_controller->SetDesktopBackgroundSolidColorMode( |
| 160 SK_ColorBLACK); |
| 160 } else { | 161 } else { |
| 161 ash::Shell::GetInstance()->user_wallpaper_delegate()-> | 162 ash::Shell::GetInstance()->user_wallpaper_delegate()-> |
| 162 SetLoggedInUserWallpaper(); | 163 InitializeWallpaper(); |
| 163 } | 164 } |
| 164 return true; | 165 return true; |
| 165 } | 166 } |
| 166 | 167 |
| 167 bool HandleToggleRootWindowFullScreen() { | 168 bool HandleToggleRootWindowFullScreen() { |
| 168 ash::Shell::GetPrimaryRootWindow()->ToggleFullScreen(); | 169 ash::Shell::GetPrimaryRootWindow()->ToggleFullScreen(); |
| 169 return true; | 170 return true; |
| 170 } | 171 } |
| 171 | 172 |
| 172 bool HandlePrintLayerHierarchy() { | 173 bool HandlePrintLayerHierarchy() { |
| (...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 550 // Then set this one as active. | 551 // Then set this one as active. |
| 551 Shell::GetInstance()->launcher()->ActivateLauncherItem(found_index); | 552 Shell::GetInstance()->launcher()->ActivateLauncherItem(found_index); |
| 552 } | 553 } |
| 553 } | 554 } |
| 554 | 555 |
| 555 bool AcceleratorController::CanHandleAccelerators() const { | 556 bool AcceleratorController::CanHandleAccelerators() const { |
| 556 return true; | 557 return true; |
| 557 } | 558 } |
| 558 | 559 |
| 559 } // namespace ash | 560 } // namespace ash |
| OLD | NEW |