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

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

Issue 10532048: [cros] Initial WebRTC-enabled implementation of user image picker on OOBE. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleanup 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
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/user_manager_impl.h" 5 #include "chrome/browser/chromeos/login/user_manager_impl.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/desktop_background/desktop_background_controller.h" 10 #include "ash/desktop_background/desktop_background_controller.h"
(...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 void UserManagerImpl::EphemeralUserLoggedIn(const std::string& email) { 349 void UserManagerImpl::EphemeralUserLoggedIn(const std::string& email) {
350 is_current_user_new_ = true; 350 is_current_user_new_ = true;
351 is_current_user_ephemeral_ = true; 351 is_current_user_ephemeral_ = true;
352 logged_in_user_ = CreateUser(email); 352 logged_in_user_ = CreateUser(email);
353 SetInitialUserImage(email); 353 SetInitialUserImage(email);
354 SetInitialUserWallpaper(email); 354 SetInitialUserWallpaper(email);
355 NotifyOnLogin(); 355 NotifyOnLogin();
356 } 356 }
357 357
358 void UserManagerImpl::StubUserLoggedIn() { 358 void UserManagerImpl::StubUserLoggedIn() {
359 is_current_user_ephemeral_ = true;
Nikita (slow) 2012/06/13 14:07:35 This should probably be kept as is.
Ivan Korotkov 2012/06/13 14:26:06 Done.
360 logged_in_user_ = new User(kStubUser, false); 359 logged_in_user_ = new User(kStubUser, false);
361 logged_in_user_->SetImage(UserImage(GetDefaultImage(kStubDefaultImageIndex)), 360 logged_in_user_->SetImage(UserImage(GetDefaultImage(kStubDefaultImageIndex)),
362 kStubDefaultImageIndex); 361 kStubDefaultImageIndex);
363 } 362 }
364 363
365 void UserManagerImpl::InitializeWallpaper() { 364 void UserManagerImpl::InitializeWallpaper() {
366 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 365 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
367 366
368 if (!IsUserLoggedIn()) { 367 if (!IsUserLoggedIn()) {
369 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableNewOobe)) { 368 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableNewOobe)) {
(...skipping 1181 matching lines...) Expand 10 before | Expand all | Expand 10 after
1551 BrowserThread::PostTask( 1550 BrowserThread::PostTask(
1552 BrowserThread::FILE, 1551 BrowserThread::FILE,
1553 FROM_HERE, 1552 FROM_HERE,
1554 base::Bind(&UserManagerImpl::DeleteUserImage, 1553 base::Bind(&UserManagerImpl::DeleteUserImage,
1555 base::Unretained(this), 1554 base::Unretained(this),
1556 image_path)); 1555 image_path));
1557 } 1556 }
1558 } 1557 }
1559 1558
1560 } // namespace chromeos 1559 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698