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

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

Issue 16114008: Fix cros multi-profile sign in visibility bug (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | no next file » | 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/login_display_host_impl.h" 5 #include "chrome/browser/chromeos/login/login_display_host_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/desktop_background/desktop_background_controller.h" 9 #include "ash/desktop_background/desktop_background_controller.h"
10 #include "ash/desktop_background/user_wallpaper_delegate.h" 10 #include "ash/desktop_background/user_wallpaper_delegate.h"
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled()) 239 if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled())
240 initialize_webui_hidden_ = false; 240 initialize_webui_hidden_ = false;
241 241
242 if (waiting_for_wallpaper_load_) { 242 if (waiting_for_wallpaper_load_) {
243 registrar_.Add(this, chrome::NOTIFICATION_WALLPAPER_ANIMATION_FINISHED, 243 registrar_.Add(this, chrome::NOTIFICATION_WALLPAPER_ANIMATION_FINISHED,
244 content::NotificationService::AllSources()); 244 content::NotificationService::AllSources());
245 } 245 }
246 246
247 // When we wait for WebUI to be initialized we wait for one of 247 // When we wait for WebUI to be initialized we wait for one of
248 // these notifications. 248 // these notifications.
249 if (waiting_for_user_pods_ && initialize_webui_hidden_) { 249 if ((waiting_for_user_pods_ || waiting_for_wallpaper_load_)
250 && initialize_webui_hidden_) {
250 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_WEBUI_VISIBLE, 251 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_WEBUI_VISIBLE,
251 content::NotificationService::AllSources()); 252 content::NotificationService::AllSources());
252 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_NETWORK_ERROR_SHOWN, 253 registrar_.Add(this, chrome::NOTIFICATION_LOGIN_NETWORK_ERROR_SHOWN,
253 content::NotificationService::AllSources()); 254 content::NotificationService::AllSources());
254 } 255 }
255 LOG(INFO) << "Login WebUI >> " 256 LOG(INFO) << "Login WebUI >> "
256 << "zero_delay: " << zero_delay_enabled 257 << "zero_delay: " << zero_delay_enabled
257 << " wait_for_wp_load_: " << waiting_for_wallpaper_load_ 258 << " wait_for_wp_load_: " << waiting_for_wallpaper_load_
258 << " wait_for_pods_: " << waiting_for_user_pods_ 259 << " wait_for_pods_: " << waiting_for_user_pods_
259 << " init_webui_hidden_: " << initialize_webui_hidden_; 260 << " init_webui_hidden_: " << initialize_webui_hidden_;
(...skipping 653 matching lines...) Expand 10 before | Expand all | Expand 10 after
913 VLOG(1) << "Initial time zone: " << timezone_name; 914 VLOG(1) << "Initial time zone: " << timezone_name;
914 // Apply locale customizations only once to preserve whatever locale 915 // Apply locale customizations only once to preserve whatever locale
915 // user has changed to during OOBE. 916 // user has changed to during OOBE.
916 if (!timezone_name.empty()) { 917 if (!timezone_name.empty()) {
917 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID( 918 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID(
918 UTF8ToUTF16(timezone_name)); 919 UTF8ToUTF16(timezone_name));
919 } 920 }
920 } 921 }
921 922
922 } // namespace chromeos 923 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698