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

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

Issue 680013002: Added initialization of EulaScreen::delegate_ in EulaScreen ctor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 | « no previous file | 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 (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/eula_screen.h" 5 #include "chrome/browser/chromeos/login/screens/eula_screen.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/chromeos/customization_document.h" 9 #include "chrome/browser/chromeos/customization_document.h"
10 #include "chrome/browser/chromeos/login/screens/screen_observer.h" 10 #include "chrome/browser/chromeos/login/screens/screen_observer.h"
11 #include "chrome/browser/chromeos/login/wizard_controller.h" 11 #include "chrome/browser/chromeos/login/wizard_controller.h"
12 #include "chromeos/dbus/cryptohome_client.h" 12 #include "chromeos/dbus/cryptohome_client.h"
13 #include "chromeos/dbus/dbus_method_call_status.h" 13 #include "chromeos/dbus/dbus_method_call_status.h"
14 #include "chromeos/dbus/dbus_thread_manager.h" 14 #include "chromeos/dbus/dbus_thread_manager.h"
15 15
16 namespace chromeos { 16 namespace chromeos {
17 17
18 EulaScreen::EulaScreen(ScreenObserver* observer, EulaScreenActor* actor) 18 EulaScreen::EulaScreen(ScreenObserver* observer, EulaScreenActor* actor)
19 : BaseScreen(observer), actor_(actor), password_fetcher_(this) { 19 : BaseScreen(observer),
20 actor_(actor),
21 delegate_(nullptr),
22 password_fetcher_(this) {
20 DCHECK(actor_); 23 DCHECK(actor_);
21 if (actor_) 24 if (actor_)
22 actor_->SetDelegate(this); 25 actor_->SetDelegate(this);
23 } 26 }
24 27
25 EulaScreen::~EulaScreen() { 28 EulaScreen::~EulaScreen() {
26 if (actor_) 29 if (actor_)
27 actor_->SetDelegate(NULL); 30 actor_->SetDelegate(NULL);
28 } 31 }
29 32
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 bool EulaScreen::IsUsageStatsEnabled() const { 101 bool EulaScreen::IsUsageStatsEnabled() const {
99 return delegate_ && delegate_->GetUsageStatisticsReporting(); 102 return delegate_ && delegate_->GetUsageStatisticsReporting();
100 } 103 }
101 104
102 void EulaScreen::OnActorDestroyed(EulaScreenActor* actor) { 105 void EulaScreen::OnActorDestroyed(EulaScreenActor* actor) {
103 if (actor_ == actor) 106 if (actor_ == actor)
104 actor_ = NULL; 107 actor_ = NULL;
105 } 108 }
106 109
107 } // namespace chromeos 110 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698