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

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

Issue 10808061: [cros] Flip enable-new-oobe switch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 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 | 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 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 is_current_user_ephemeral_ = true; 370 is_current_user_ephemeral_ = true;
371 logged_in_user_ = CreateUser(email, /* is_ephemeral= */ true); 371 logged_in_user_ = CreateUser(email, /* is_ephemeral= */ true);
372 SetInitialUserImage(email); 372 SetInitialUserImage(email);
373 SetInitialUserWallpaper(email); 373 SetInitialUserWallpaper(email);
374 NotifyOnLogin(); 374 NotifyOnLogin();
375 } 375 }
376 376
377 void UserManagerImpl::InitializeWallpaper() { 377 void UserManagerImpl::InitializeWallpaper() {
378 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 378 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
379 if (!IsUserLoggedIn()) { 379 if (!IsUserLoggedIn()) {
380 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableNewOobe)) { 380 if (!CommandLine::ForCurrentProcess()->HasSwitch(
381 if (!WizardController::IsDeviceRegistered()) { 381 switches::kDisableNewOobe)) {
382 if (!WizardController::IsDeviceRegistered() &&
383 !WizardController::IsZeroDelayEnabled()) {
382 // TODO(nkostylev): Add switch to disable wallpaper transition on OOBE. 384 // TODO(nkostylev): Add switch to disable wallpaper transition on OOBE.
383 // Should be used on test images so that they are not slowed down. 385 // Should be used on test images so that they are not slowed down.
384 ash::Shell::GetInstance()->desktop_background_controller()-> 386 ash::Shell::GetInstance()->desktop_background_controller()->
385 SetDefaultWallpaper(kDefaultOOBEWallpaperIndex); 387 SetDefaultWallpaper(kDefaultOOBEWallpaperIndex);
386 } else { 388 } else {
387 bool show_users = true; 389 bool show_users = true;
388 bool result = CrosSettings::Get()->GetBoolean( 390 bool result = CrosSettings::Get()->GetBoolean(
389 kAccountsPrefShowUserNamesOnSignIn, &show_users); 391 kAccountsPrefShowUserNamesOnSignIn, &show_users);
390 DCHECK(result) << "Unable to fetch setting " 392 DCHECK(result) << "Unable to fetch setting "
391 << kAccountsPrefShowUserNamesOnSignIn; 393 << kAccountsPrefShowUserNamesOnSignIn;
(...skipping 1295 matching lines...) Expand 10 before | Expand all | Expand 10 after
1687 BrowserThread::PostTask( 1689 BrowserThread::PostTask(
1688 BrowserThread::FILE, 1690 BrowserThread::FILE,
1689 FROM_HERE, 1691 FROM_HERE,
1690 base::Bind(&UserManagerImpl::DeleteUserImage, 1692 base::Bind(&UserManagerImpl::DeleteUserImage,
1691 base::Unretained(this), 1693 base::Unretained(this),
1692 image_path)); 1694 image_path));
1693 } 1695 }
1694 } 1696 }
1695 1697
1696 } // namespace chromeos 1698 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698