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

Side by Side Diff: chrome/browser/chromeos/login/screens/user_image_screen.cc

Issue 1141163003: Enabled first-run tutorial for ephemeral users. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
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/screens/user_image_screen.h" 5 #include "chrome/browser/chromeos/login/screens/user_image_screen.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 user_photo_ = gfx::ImageSkia(); 102 user_photo_ = gfx::ImageSkia();
103 ImageDecoder::Cancel(this); 103 ImageDecoder::Cancel(this);
104 ImageDecoder::Start(this, raw_data); 104 ImageDecoder::Start(this, raw_data);
105 } 105 }
106 106
107 void UserImageScreen::OnCameraPresenceCheckDone(bool is_camera_present) { 107 void UserImageScreen::OnCameraPresenceCheckDone(bool is_camera_present) {
108 GetContextEditor().SetBoolean(kContextKeyIsCameraPresent, is_camera_present); 108 GetContextEditor().SetBoolean(kContextKeyIsCameraPresent, is_camera_present);
109 } 109 }
110 110
111 void UserImageScreen::HideCurtain() { 111 void UserImageScreen::HideCurtain() {
112 // Skip user image selection for ephemeral users.
113 if (user_manager::UserManager::Get()->IsUserNonCryptohomeDataEphemeral(
114 GetUser()->GetUserID())) {
115 ExitScreen();
116 }
112 if (view_) 117 if (view_)
113 view_->HideCurtain(); 118 view_->HideCurtain();
114 } 119 }
115 120
116 void UserImageScreen::OnImageDecoded(const SkBitmap& decoded_image) { 121 void UserImageScreen::OnImageDecoded(const SkBitmap& decoded_image) {
117 user_photo_ = gfx::ImageSkia::CreateFrom1xBitmap(decoded_image); 122 user_photo_ = gfx::ImageSkia::CreateFrom1xBitmap(decoded_image);
118 if (accept_photo_after_decoding_) 123 if (accept_photo_after_decoding_)
119 OnImageAccepted(); 124 OnImageAccepted();
120 } 125 }
121 126
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 341
337 void UserImageScreen::ExitScreen() { 342 void UserImageScreen::ExitScreen() {
338 policy_registrar_.reset(); 343 policy_registrar_.reset();
339 sync_timer_.reset(); 344 sync_timer_.reset();
340 if (UserImageSyncObserver* sync_observer = GetSyncObserver()) 345 if (UserImageSyncObserver* sync_observer = GetSyncObserver())
341 sync_observer->RemoveObserver(this); 346 sync_observer->RemoveObserver(this);
342 Finish(BaseScreenDelegate::USER_IMAGE_SELECTED); 347 Finish(BaseScreenDelegate::USER_IMAGE_SELECTED);
343 } 348 }
344 349
345 } // namespace chromeos 350 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698