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/desktop_background/desktop_background_controller.h" | 8 #include "ash/desktop_background/desktop_background_controller.h" |
9 #include "ash/ash_switches.h" | 9 #include "ash/ash_switches.h" |
10 #include "ash/caps_lock_delegate.h" | 10 #include "ash/caps_lock_delegate.h" |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
90 return true; | 90 return true; |
91 } | 91 } |
92 | 92 |
93 bool HandleToggleDesktopBackgroundMode() { | 93 bool HandleToggleDesktopBackgroundMode() { |
94 ash::DesktopBackgroundController* desktop_background_controller = | 94 ash::DesktopBackgroundController* desktop_background_controller = |
95 ash::Shell::GetInstance()->desktop_background_controller(); | 95 ash::Shell::GetInstance()->desktop_background_controller(); |
96 if (desktop_background_controller->desktop_background_mode() == | 96 if (desktop_background_controller->desktop_background_mode() == |
97 ash::DesktopBackgroundController::BACKGROUND_IMAGE) | 97 ash::DesktopBackgroundController::BACKGROUND_IMAGE) |
98 desktop_background_controller->SetDesktopBackgroundSolidColorMode(); | 98 desktop_background_controller->SetDesktopBackgroundSolidColorMode(); |
99 else | 99 else |
100 desktop_background_controller->SetPreviousDesktopBackgroundImage(); | 100 desktop_background_controller->OnUserLoginOrSwitchToImageMode(); |
flackr
2012/03/22 02:26:09
OnDesktopBackgroundChanged?
bshe
2012/03/22 02:48:11
Done.
| |
101 return true; | 101 return true; |
102 } | 102 } |
103 | 103 |
104 bool HandleToggleRootWindowFullScreen() { | 104 bool HandleToggleRootWindowFullScreen() { |
105 ash::Shell::GetRootWindow()->ToggleFullScreen(); | 105 ash::Shell::GetRootWindow()->ToggleFullScreen(); |
106 return true; | 106 return true; |
107 } | 107 } |
108 | 108 |
109 bool HandlePrintLayerHierarchy() { | 109 bool HandlePrintLayerHierarchy() { |
110 aura::RootWindow* root_window = ash::Shell::GetRootWindow(); | 110 aura::RootWindow* root_window = ash::Shell::GetRootWindow(); |
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
298 NOTREACHED() << "Unhandled action " << it->second; | 298 NOTREACHED() << "Unhandled action " << it->second; |
299 } | 299 } |
300 return false; | 300 return false; |
301 } | 301 } |
302 | 302 |
303 bool AcceleratorController::CanHandleAccelerators() const { | 303 bool AcceleratorController::CanHandleAccelerators() const { |
304 return true; | 304 return true; |
305 } | 305 } |
306 | 306 |
307 } // namespace ash | 307 } // namespace ash |
OLD | NEW |