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

Side by Side Diff: ash/accelerators/accelerator_controller.cc

Issue 10459003: Load user custom wallpaper after browser crash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Nit Created 8 years, 6 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/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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 ash::Shell::GetRootWindow()->layer()->GetAnimator()->StartAnimation( 130 ash::Shell::GetRootWindow()->layer()->GetAnimator()->StartAnimation(
131 screen_rotation.release()); 131 screen_rotation.release());
132 return true; 132 return true;
133 } 133 }
134 134
135 bool HandleToggleDesktopBackgroundMode() { 135 bool HandleToggleDesktopBackgroundMode() {
136 ash::DesktopBackgroundController* desktop_background_controller = 136 ash::DesktopBackgroundController* desktop_background_controller =
137 ash::Shell::GetInstance()->desktop_background_controller(); 137 ash::Shell::GetInstance()->desktop_background_controller();
138 if (desktop_background_controller->desktop_background_mode() == 138 if (desktop_background_controller->desktop_background_mode() ==
139 ash::DesktopBackgroundController::BACKGROUND_IMAGE) 139 ash::DesktopBackgroundController::BACKGROUND_IMAGE)
140 desktop_background_controller->SetDesktopBackgroundSolidColorMode(); 140 desktop_background_controller->SetDesktopBackgroundSolidColorMode();
Nikita (slow) 2012/05/30 17:25:06 Both blocks should have { }
bshe 2012/05/30 23:33:05 Done.
141 else 141 else {
142 desktop_background_controller->SetLoggedInUserWallpaper(); 142 ash::Shell::GetInstance()->user_wallpaper_delegate()->
143 SetLoggedInUserWallpaper();
144 }
143 return true; 145 return true;
144 } 146 }
145 147
146 bool HandleToggleRootWindowFullScreen() { 148 bool HandleToggleRootWindowFullScreen() {
147 ash::Shell::GetRootWindow()->ToggleFullScreen(); 149 ash::Shell::GetRootWindow()->ToggleFullScreen();
148 return true; 150 return true;
149 } 151 }
150 152
151 bool HandlePrintLayerHierarchy() { 153 bool HandlePrintLayerHierarchy() {
152 aura::RootWindow* root_window = ash::Shell::GetRootWindow(); 154 aura::RootWindow* root_window = ash::Shell::GetRootWindow();
(...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
503 // Then set this one as active. 505 // Then set this one as active.
504 Shell::GetInstance()->launcher()->ActivateLauncherItem(found_index); 506 Shell::GetInstance()->launcher()->ActivateLauncherItem(found_index);
505 } 507 }
506 } 508 }
507 509
508 bool AcceleratorController::CanHandleAccelerators() const { 510 bool AcceleratorController::CanHandleAccelerators() const {
509 return true; 511 return true;
510 } 512 }
511 513
512 } // namespace ash 514 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698