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

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

Issue 9764012: Restore to user selected wallpaper after browser crash (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Create a dummy class to fix test fail. Created 8 years, 9 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/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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 return true; 101 return true;
102 } 102 }
103 103
104 bool HandleToggleDesktopBackgroundMode() { 104 bool HandleToggleDesktopBackgroundMode() {
105 ash::DesktopBackgroundController* desktop_background_controller = 105 ash::DesktopBackgroundController* desktop_background_controller =
106 ash::Shell::GetInstance()->desktop_background_controller(); 106 ash::Shell::GetInstance()->desktop_background_controller();
107 if (desktop_background_controller->desktop_background_mode() == 107 if (desktop_background_controller->desktop_background_mode() ==
108 ash::DesktopBackgroundController::BACKGROUND_IMAGE) 108 ash::DesktopBackgroundController::BACKGROUND_IMAGE)
109 desktop_background_controller->SetDesktopBackgroundSolidColorMode(); 109 desktop_background_controller->SetDesktopBackgroundSolidColorMode();
110 else 110 else
111 desktop_background_controller->SetPreviousDesktopBackgroundImage(); 111 desktop_background_controller->OnDesktopBackgroundChanged();
112 return true; 112 return true;
113 } 113 }
114 114
115 bool HandleToggleRootWindowFullScreen() { 115 bool HandleToggleRootWindowFullScreen() {
116 ash::Shell::GetRootWindow()->ToggleFullScreen(); 116 ash::Shell::GetRootWindow()->ToggleFullScreen();
117 return true; 117 return true;
118 } 118 }
119 119
120 bool HandlePrintLayerHierarchy() { 120 bool HandlePrintLayerHierarchy() {
121 aura::RootWindow* root_window = ash::Shell::GetRootWindow(); 121 aura::RootWindow* root_window = ash::Shell::GetRootWindow();
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 new_item.status = STATUS_ACTIVE; 368 new_item.status = STATUS_ACTIVE;
369 Shell::GetInstance()->launcher()->model()->Set(found_index, new_item); 369 Shell::GetInstance()->launcher()->model()->Set(found_index, new_item);
370 } 370 }
371 } 371 }
372 372
373 bool AcceleratorController::CanHandleAccelerators() const { 373 bool AcceleratorController::CanHandleAccelerators() const {
374 return true; 374 return true;
375 } 375 }
376 376
377 } // namespace ash 377 } // 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