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

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

Issue 10207030: Asynchronously load wallpapers when user pod is selected. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Nits Created 8 years, 7 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
« no previous file with comments | « no previous file | ash/desktop_background/desktop_background_controller.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 return true; 192 return true;
193 } 193 }
194 194
195 bool HandleToggleDesktopBackgroundMode() { 195 bool HandleToggleDesktopBackgroundMode() {
196 ash::DesktopBackgroundController* desktop_background_controller = 196 ash::DesktopBackgroundController* desktop_background_controller =
197 ash::Shell::GetInstance()->desktop_background_controller(); 197 ash::Shell::GetInstance()->desktop_background_controller();
198 if (desktop_background_controller->desktop_background_mode() == 198 if (desktop_background_controller->desktop_background_mode() ==
199 ash::DesktopBackgroundController::BACKGROUND_IMAGE) 199 ash::DesktopBackgroundController::BACKGROUND_IMAGE)
200 desktop_background_controller->SetDesktopBackgroundSolidColorMode(); 200 desktop_background_controller->SetDesktopBackgroundSolidColorMode();
201 else 201 else
202 desktop_background_controller->SetDesktopBackgroundImageMode(); 202 desktop_background_controller->SetLoggedInUserWallpaper();
203 return true; 203 return true;
204 } 204 }
205 205
206 bool HandleToggleRootWindowFullScreen() { 206 bool HandleToggleRootWindowFullScreen() {
207 ash::Shell::GetRootWindow()->ToggleFullScreen(); 207 ash::Shell::GetRootWindow()->ToggleFullScreen();
208 return true; 208 return true;
209 } 209 }
210 210
211 bool HandlePrintLayerHierarchy() { 211 bool HandlePrintLayerHierarchy() {
212 aura::RootWindow* root_window = ash::Shell::GetRootWindow(); 212 aura::RootWindow* root_window = ash::Shell::GetRootWindow();
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
552 // Then set this one as active. 552 // Then set this one as active.
553 ActivateLauncherItem(found_index); 553 ActivateLauncherItem(found_index);
554 } 554 }
555 } 555 }
556 556
557 bool AcceleratorController::CanHandleAccelerators() const { 557 bool AcceleratorController::CanHandleAccelerators() const {
558 return true; 558 return true;
559 } 559 }
560 560
561 } // namespace ash 561 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/desktop_background/desktop_background_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698