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

Side by Side Diff: chrome/browser/chromeos/login/webui_login_display_host.cc

Issue 10831325: Add --disable-oobe-animation flag to disable OOBE animation on slow hardware (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sorting Created 8 years, 4 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 | « chrome/browser/chromeos/login/login_utils.cc ('k') | chrome/common/chrome_switches.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 "chrome/browser/chromeos/login/webui_login_display_host.h" 5 #include "chrome/browser/chromeos/login/webui_login_display_host.h"
6 6
7 #include "ash/desktop_background/desktop_background_controller.h" 7 #include "ash/desktop_background/desktop_background_controller.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "ash/shell_window_ids.h" 9 #include "ash/shell_window_ids.h"
10 #include "ash/wm/window_animations.h" 10 #include "ash/wm/window_animations.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 webui_login_display_(NULL), 64 webui_login_display_(NULL),
65 is_showing_login_(false), 65 is_showing_login_(false),
66 is_wallpaper_loaded_(false), 66 is_wallpaper_loaded_(false),
67 initialize_webui_in_parallel_(kInitializeWebUIInParallelDefault), 67 initialize_webui_in_parallel_(kInitializeWebUIInParallelDefault),
68 status_area_saved_visibility_(false), 68 status_area_saved_visibility_(false),
69 crash_count_(0), 69 crash_count_(0),
70 restore_path_(RESTORE_UNKNOWN) { 70 restore_path_(RESTORE_UNKNOWN) {
71 bool is_registered = WizardController::IsDeviceRegistered(); 71 bool is_registered = WizardController::IsDeviceRegistered();
72 bool zero_delay_enabled = WizardController::IsZeroDelayEnabled(); 72 bool zero_delay_enabled = WizardController::IsZeroDelayEnabled();
73 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableNewOobe) && 73 if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableNewOobe) &&
74 !CommandLine::ForCurrentProcess()->HasSwitch(
75 switches::kDisableOobeAnimation) &&
74 !zero_delay_enabled) { 76 !zero_delay_enabled) {
75 bool disable_boot_animation = CommandLine::ForCurrentProcess()-> 77 bool disable_boot_animation = CommandLine::ForCurrentProcess()->
76 HasSwitch(switches::kDisableBootAnimation); 78 HasSwitch(switches::kDisableBootAnimation);
77 waiting_for_wallpaper_load_ = !is_registered || !disable_boot_animation; 79 waiting_for_wallpaper_load_ = !is_registered || !disable_boot_animation;
78 } else { 80 } else {
79 waiting_for_wallpaper_load_ = false; 81 waiting_for_wallpaper_load_ = false;
80 } 82 }
81 83
82 if (waiting_for_wallpaper_load_) { 84 if (waiting_for_wallpaper_load_) {
83 registrar_.Add(this, chrome::NOTIFICATION_WALLPAPER_ANIMATION_FINISHED, 85 registrar_.Add(this, chrome::NOTIFICATION_WALLPAPER_ANIMATION_FINISHED,
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 } 134 }
133 135
134 void WebUILoginDisplayHost::SetOobeProgressBarVisible(bool visible) { 136 void WebUILoginDisplayHost::SetOobeProgressBarVisible(bool visible) {
135 GetOobeUI()->ShowOobeUI(visible); 137 GetOobeUI()->ShowOobeUI(visible);
136 } 138 }
137 139
138 void WebUILoginDisplayHost::SetShutdownButtonEnabled(bool enable) { 140 void WebUILoginDisplayHost::SetShutdownButtonEnabled(bool enable) {
139 } 141 }
140 142
141 void WebUILoginDisplayHost::SetStatusAreaVisible(bool visible) { 143 void WebUILoginDisplayHost::SetStatusAreaVisible(bool visible) {
142 if (waiting_for_wallpaper_load_ && initialize_webui_in_parallel_) 144 if (waiting_for_wallpaper_load_ && initialize_webui_in_parallel_)
143 status_area_saved_visibility_ = visible; 145 status_area_saved_visibility_ = visible;
144 else if (login_view_) 146 else if (login_view_)
145 login_view_->SetStatusAreaVisible(visible); 147 login_view_->SetStatusAreaVisible(visible);
146 } 148 }
147 149
148 void WebUILoginDisplayHost::StartWizard(const std::string& first_screen_name, 150 void WebUILoginDisplayHost::StartWizard(const std::string& first_screen_name,
149 DictionaryValue* screen_parameters) { 151 DictionaryValue* screen_parameters) {
150 // Keep parameters to restore if renderer crashes. 152 // Keep parameters to restore if renderer crashes.
151 restore_path_ = RESTORE_WIZARD; 153 restore_path_ = RESTORE_WIZARD;
152 wizard_first_screen_name_ = first_screen_name; 154 wizard_first_screen_name_ = first_screen_name;
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 case RESTORE_SIGN_IN: 344 case RESTORE_SIGN_IN:
343 StartSignInScreen(); 345 StartSignInScreen();
344 break; 346 break;
345 default: 347 default:
346 NOTREACHED(); 348 NOTREACHED();
347 break; 349 break;
348 } 350 }
349 } 351 }
350 352
351 } // namespace chromeos 353 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/login_utils.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698