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

Side by Side Diff: chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.cc

Issue 1067593005: Fix race conditions in ImageDecoder. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use TestBrowserThreadBundle, cleanup tests Created 5 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/supervised/supervised_user_creation_scre en.h" 5 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_scre en.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 "base/rand_util.h" 9 #include "base/rand_util.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 SupervisedUserCreationScreen* SupervisedUserCreationScreen::Get( 93 SupervisedUserCreationScreen* SupervisedUserCreationScreen::Get(
94 ScreenManager* manager) { 94 ScreenManager* manager) {
95 return static_cast<SupervisedUserCreationScreen*>( 95 return static_cast<SupervisedUserCreationScreen*>(
96 manager->GetScreen(WizardController::kSupervisedUserCreationScreenName)); 96 manager->GetScreen(WizardController::kSupervisedUserCreationScreenName));
97 } 97 }
98 98
99 SupervisedUserCreationScreen::SupervisedUserCreationScreen( 99 SupervisedUserCreationScreen::SupervisedUserCreationScreen(
100 BaseScreenDelegate* base_screen_delegate, 100 BaseScreenDelegate* base_screen_delegate,
101 SupervisedUserCreationScreenHandler* actor) 101 SupervisedUserCreationScreenHandler* actor)
102 : BaseScreen(base_screen_delegate), 102 : BaseScreen(base_screen_delegate),
103 ImageRequest(content::BrowserThread::GetMessageLoopProxyForThread(
104 content::BrowserThread::UI)),
105 actor_(actor), 103 actor_(actor),
106 on_error_screen_(false), 104 on_error_screen_(false),
107 manager_signin_in_progress_(false), 105 manager_signin_in_progress_(false),
108 last_page_(kNameOfIntroScreen), 106 last_page_(kNameOfIntroScreen),
109 sync_service_(NULL), 107 sync_service_(NULL),
110 apply_photo_after_decoding_(false), 108 apply_photo_after_decoding_(false),
111 selected_image_(0), 109 selected_image_(0),
112 histogram_helper_(new ErrorScreensHistogramHelper("Supervised")), 110 histogram_helper_(new ErrorScreensHistogramHelper("Supervised")),
113 weak_factory_(this) { 111 weak_factory_(this) {
114 DCHECK(actor_); 112 DCHECK(actor_);
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
619 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL; 617 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL;
620 } else { 618 } else {
621 NOTREACHED() << "Unexpected image type: " << image_type; 619 NOTREACHED() << "Unexpected image type: " << image_type;
622 } 620 }
623 } 621 }
624 622
625 void SupervisedUserCreationScreen::OnImageAccepted() { 623 void SupervisedUserCreationScreen::OnImageAccepted() {
626 } 624 }
627 625
628 } // namespace chromeos 626 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698