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

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

Issue 566863003: Declaring the weak_ptr_factory in proper order. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 SupervisedUserCreationScreen* SupervisedUserCreationScreen::Get( 90 SupervisedUserCreationScreen* SupervisedUserCreationScreen::Get(
91 ScreenManager* manager) { 91 ScreenManager* manager) {
92 return static_cast<SupervisedUserCreationScreen*>( 92 return static_cast<SupervisedUserCreationScreen*>(
93 manager->GetScreen(WizardController::kSupervisedUserCreationScreenName)); 93 manager->GetScreen(WizardController::kSupervisedUserCreationScreenName));
94 } 94 }
95 95
96 SupervisedUserCreationScreen::SupervisedUserCreationScreen( 96 SupervisedUserCreationScreen::SupervisedUserCreationScreen(
97 ScreenObserver* observer, 97 ScreenObserver* observer,
98 SupervisedUserCreationScreenHandler* actor) 98 SupervisedUserCreationScreenHandler* actor)
99 : WizardScreen(observer), 99 : WizardScreen(observer),
100 weak_factory_(this),
101 actor_(actor), 100 actor_(actor),
102 on_error_screen_(false), 101 on_error_screen_(false),
103 last_page_(kNameOfIntroScreen), 102 last_page_(kNameOfIntroScreen),
104 sync_service_(NULL), 103 sync_service_(NULL),
105 image_decoder_(NULL), 104 image_decoder_(NULL),
106 apply_photo_after_decoding_(false), 105 apply_photo_after_decoding_(false),
107 selected_image_(0) { 106 selected_image_(0),
107 weak_factory_(this) {
108 DCHECK(actor_); 108 DCHECK(actor_);
109 if (actor_) 109 if (actor_)
110 actor_->SetDelegate(this); 110 actor_->SetDelegate(this);
111 } 111 }
112 112
113 SupervisedUserCreationScreen::~SupervisedUserCreationScreen() { 113 SupervisedUserCreationScreen::~SupervisedUserCreationScreen() {
114 CameraPresenceNotifier::GetInstance()->RemoveObserver(this); 114 CameraPresenceNotifier::GetInstance()->RemoveObserver(this);
115 if (sync_service_) 115 if (sync_service_)
116 sync_service_->RemoveObserver(this); 116 sync_service_->RemoveObserver(this);
117 if (actor_) 117 if (actor_)
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
602 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL; 602 selected_image_ = user_manager::User::USER_IMAGE_EXTERNAL;
603 } else { 603 } else {
604 NOTREACHED() << "Unexpected image type: " << image_type; 604 NOTREACHED() << "Unexpected image type: " << image_type;
605 } 605 }
606 } 606 }
607 607
608 void SupervisedUserCreationScreen::OnImageAccepted() { 608 void SupervisedUserCreationScreen::OnImageAccepted() {
609 } 609 }
610 610
611 } // namespace chromeos 611 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/supervised/supervised_user_creation_screen.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698