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

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

Issue 2566443005: cros: Replace WizardController string constants with OobeScreen values. (Closed)
Patch Set: Address comments Created 3 years, 11 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 53
54 // Maximum amount of time to wait for the user image to sync. 54 // Maximum amount of time to wait for the user image to sync.
55 // The screen is shown iff sync failed or time limit exceeded. 55 // The screen is shown iff sync failed or time limit exceeded.
56 const int kSyncTimeoutSeconds = 10; 56 const int kSyncTimeoutSeconds = 10;
57 57
58 } // namespace 58 } // namespace
59 59
60 // static 60 // static
61 UserImageScreen* UserImageScreen::Get(ScreenManager* manager) { 61 UserImageScreen* UserImageScreen::Get(ScreenManager* manager) {
62 return static_cast<UserImageScreen*>( 62 return static_cast<UserImageScreen*>(
63 manager->GetScreen(WizardController::kUserImageScreenName)); 63 manager->GetScreen(OobeScreen::SCREEN_USER_IMAGE_PICKER));
64 } 64 }
65 65
66 UserImageScreen::UserImageScreen(BaseScreenDelegate* base_screen_delegate, 66 UserImageScreen::UserImageScreen(BaseScreenDelegate* base_screen_delegate,
67 UserImageView* view) 67 UserImageView* view)
68 : UserImageModel(base_screen_delegate), 68 : UserImageModel(base_screen_delegate),
69 view_(view), 69 view_(view),
70 accept_photo_after_decoding_(false), 70 accept_photo_after_decoding_(false),
71 selected_image_(user_manager::User::USER_IMAGE_INVALID), 71 selected_image_(user_manager::User::USER_IMAGE_INVALID),
72 is_screen_ready_(false), 72 is_screen_ready_(false),
73 user_has_selected_image_(false) { 73 user_has_selected_image_(false) {
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 331
332 void UserImageScreen::ReportSyncResult(SyncResult timed_out) const { 332 void UserImageScreen::ReportSyncResult(SyncResult timed_out) const {
333 base::TimeDelta duration = base::Time::Now() - sync_waiting_start_time_; 333 base::TimeDelta duration = base::Time::Now() - sync_waiting_start_time_;
334 UMA_HISTOGRAM_TIMES("Login.NewUserPriorityPrefsSyncTime", duration); 334 UMA_HISTOGRAM_TIMES("Login.NewUserPriorityPrefsSyncTime", duration);
335 UMA_HISTOGRAM_ENUMERATION("Login.NewUserPriorityPrefsSyncResult", 335 UMA_HISTOGRAM_ENUMERATION("Login.NewUserPriorityPrefsSyncResult",
336 static_cast<int>(timed_out), 336 static_cast<int>(timed_out),
337 static_cast<int>(SyncResult::COUNT)); 337 static_cast<int>(SyncResult::COUNT));
338 } 338 }
339 339
340 } // namespace chromeos 340 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/screens/user_image_model.cc ('k') | chrome/browser/chromeos/login/screens/wrong_hwid_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698