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

Side by Side Diff: chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc

Issue 382153006: Fix 'except' and 'prefer' spelling. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Drop change to braille_table.js because it fails CQ. Created 6 years, 5 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
« no previous file with comments | « chrome/browser/process_singleton.h ('k') | chromeos/system/statistics_provider.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.h" 5 #include "chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.h"
6 6
7 #include "ash/desktop_background/user_wallpaper_delegate.h" 7 #include "ash/desktop_background/user_wallpaper_delegate.h"
8 #include "ash/root_window_controller.h" 8 #include "ash/root_window_controller.h"
9 #include "ash/shelf/shelf_layout_manager.h" 9 #include "ash/shelf/shelf_layout_manager.h"
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 duration_override); 179 duration_override);
180 } 180 }
181 181
182 // For each root window hide the shelf. 182 // For each root window hide the shelf.
183 if (animation_step == ANIMATION_STEP_HIDE_OLD_USER) { 183 if (animation_step == ANIMATION_STEP_HIDE_OLD_USER) {
184 aura::Window::Windows root_windows = ash::Shell::GetAllRootWindows(); 184 aura::Window::Windows root_windows = ash::Shell::GetAllRootWindows();
185 for (aura::Window::Windows::const_iterator iter = root_windows.begin(); 185 for (aura::Window::Windows::const_iterator iter = root_windows.begin();
186 iter != root_windows.end(); ++iter) { 186 iter != root_windows.end(); ++iter) {
187 // This shelf change is only part of the animation and will be updated by 187 // This shelf change is only part of the animation and will be updated by
188 // ChromeLauncherController::ActiveUserChanged() to the new users value. 188 // ChromeLauncherController::ActiveUserChanged() to the new users value.
189 // Note that the user perference will not be changed. 189 // Note that the user preference will not be changed.
190 ash::Shell::GetInstance()->SetShelfAutoHideBehavior( 190 ash::Shell::GetInstance()->SetShelfAutoHideBehavior(
191 ash::SHELF_AUTO_HIDE_ALWAYS_HIDDEN, *iter); 191 ash::SHELF_AUTO_HIDE_ALWAYS_HIDDEN, *iter);
192 } 192 }
193 } 193 }
194 } 194 }
195 195
196 void UserSwichAnimatorChromeOS::TransitionWindows( 196 void UserSwichAnimatorChromeOS::TransitionWindows(
197 AnimationStep animation_step) { 197 AnimationStep animation_step) {
198 // Disable the window position manager and the MRU window tracker temporarily. 198 // Disable the window position manager and the MRU window tracker temporarily.
199 UserChangeActionDisabler disabler; 199 UserChangeActionDisabler disabler;
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 if (cover == OLD_USER_COVERS_SCREEN) 317 if (cover == OLD_USER_COVERS_SCREEN)
318 return BOTH_USERS_COVER_SCREEN; 318 return BOTH_USERS_COVER_SCREEN;
319 else 319 else
320 cover = NEW_USER_COVERS_SCREEN; 320 cover = NEW_USER_COVERS_SCREEN;
321 } 321 }
322 } 322 }
323 return cover; 323 return cover;
324 } 324 }
325 325
326 } // namespace chrome 326 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/browser/process_singleton.h ('k') | chromeos/system/statistics_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698