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

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

Issue 13633003: Part of multiprofile implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: m Created 7 years, 8 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 | « no previous file | chrome/browser/chromeos/login/captive_portal_window_proxy.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 (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/base_login_display_host.h" 5 #include "chrome/browser/chromeos/login/base_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 "base/bind.h" 10 #include "base/bind.h"
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 157
158 //////////////////////////////////////////////////////////////////////////////// 158 ////////////////////////////////////////////////////////////////////////////////
159 // BaseLoginDisplayHost, LoginDisplayHost implementation: 159 // BaseLoginDisplayHost, LoginDisplayHost implementation:
160 160
161 void BaseLoginDisplayHost::BeforeSessionStart() { 161 void BaseLoginDisplayHost::BeforeSessionStart() {
162 session_starting_ = true; 162 session_starting_ = true;
163 } 163 }
164 164
165 void BaseLoginDisplayHost::OnSessionStart() { 165 void BaseLoginDisplayHost::OnSessionStart() {
166 DVLOG(1) << "Session starting"; 166 DVLOG(1) << "Session starting";
167 if (chromeos::UserManager::Get()->IsCurrentUserNew()) { 167 ash::Shell::GetInstance()->
168 ash::Shell::GetInstance()-> 168 desktop_background_controller()->MoveDesktopToUnlockedContainer();
169 desktop_background_controller()->MoveDesktopToUnlockedContainer();
170 }
171 if (wizard_controller_.get()) 169 if (wizard_controller_.get())
172 wizard_controller_->OnSessionStart(); 170 wizard_controller_->OnSessionStart();
173 // Display host is deleted once animation is completed 171 // Display host is deleted once animation is completed
174 // since sign in screen widget has to stay alive. 172 // since sign in screen widget has to stay alive.
175 StartAnimation(); 173 StartAnimation();
176 ShutdownDisplayHost(false); 174 ShutdownDisplayHost(false);
177 } 175 }
178 176
179 void BaseLoginDisplayHost::OnCompleteLogin() { 177 void BaseLoginDisplayHost::OnCompleteLogin() {
180 // Cancelling the |auto_enrollment_client_| now allows it to determine whether 178 // Cancelling the |auto_enrollment_client_| now allows it to determine whether
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
505 VLOG(1) << "Initial time zone: " << timezone_name; 503 VLOG(1) << "Initial time zone: " << timezone_name;
506 // Apply locale customizations only once to preserve whatever locale 504 // Apply locale customizations only once to preserve whatever locale
507 // user has changed to during OOBE. 505 // user has changed to during OOBE.
508 if (!timezone_name.empty()) { 506 if (!timezone_name.empty()) {
509 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID( 507 chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID(
510 UTF8ToUTF16(timezone_name)); 508 UTF8ToUTF16(timezone_name));
511 } 509 }
512 } 510 }
513 511
514 } // namespace chromeos 512 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/captive_portal_window_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698