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

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

Issue 10492003: Use a #fefefe solid color wallpaper background before user login for GAIA login flow (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nits 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
« 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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 Shell::GetPrimaryRootWindow()->layer()->GetAnimator()->StartAnimation( 152 Shell::GetPrimaryRootWindow()->layer()->GetAnimator()->StartAnimation(
153 screen_rotation.release()); 153 screen_rotation.release());
154 return true; 154 return true;
155 } 155 }
156 156
157 bool HandleToggleDesktopBackgroundMode() { 157 bool HandleToggleDesktopBackgroundMode() {
158 DesktopBackgroundController* desktop_background_controller = 158 DesktopBackgroundController* desktop_background_controller =
159 Shell::GetInstance()->desktop_background_controller(); 159 Shell::GetInstance()->desktop_background_controller();
160 if (desktop_background_controller->desktop_background_mode() == 160 if (desktop_background_controller->desktop_background_mode() ==
161 DesktopBackgroundController::BACKGROUND_IMAGE) { 161 DesktopBackgroundController::BACKGROUND_IMAGE) {
162 desktop_background_controller->SetDesktopBackgroundSolidColorMode(); 162 desktop_background_controller->SetDesktopBackgroundSolidColorMode(
163 SK_ColorBLACK);
163 } else { 164 } else {
164 Shell::GetInstance()->user_wallpaper_delegate()-> 165 ash::Shell::GetInstance()->user_wallpaper_delegate()->
165 SetLoggedInUserWallpaper(); 166 InitializeWallpaper();
166 } 167 }
167 return true; 168 return true;
168 } 169 }
169 170
170 bool HandleToggleRootWindowFullScreen() { 171 bool HandleToggleRootWindowFullScreen() {
171 Shell::GetPrimaryRootWindow()->ToggleFullScreen(); 172 Shell::GetPrimaryRootWindow()->ToggleFullScreen();
172 return true; 173 return true;
173 } 174 }
174 175
175 bool HandlePrintLayerHierarchy() { 176 bool HandlePrintLayerHierarchy() {
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 // Then set this one as active. 560 // Then set this one as active.
560 Shell::GetInstance()->launcher()->ActivateLauncherItem(found_index); 561 Shell::GetInstance()->launcher()->ActivateLauncherItem(found_index);
561 } 562 }
562 } 563 }
563 564
564 bool AcceleratorController::CanHandleAccelerators() const { 565 bool AcceleratorController::CanHandleAccelerators() const {
565 return true; 566 return true;
566 } 567 }
567 568
568 } // namespace ash 569 } // 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