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

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

Issue 647043004: WizardScreen is merged to BaseScreen. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git/+/master
Patch Set: Created 6 years, 2 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/screens/controller_pairing_screen.h" 5 #include "chrome/browser/chromeos/login/screens/controller_pairing_screen.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/chromeos/login/wizard_controller.h" 9 #include "chrome/browser/chromeos/login/wizard_controller.h"
10 #include "google_apis/gaia/gaia_auth_util.h" 10 #include "google_apis/gaia/gaia_auth_util.h"
11 11
12 using namespace chromeos::controller_pairing; 12 using namespace chromeos::controller_pairing;
13 using namespace pairing_chromeos; 13 using namespace pairing_chromeos;
14 14
15 namespace chromeos { 15 namespace chromeos {
16 16
17 ControllerPairingScreen::ControllerPairingScreen( 17 ControllerPairingScreen::ControllerPairingScreen(
18 ScreenObserver* observer, 18 ScreenObserver* observer,
19 ControllerPairingScreenActor* actor, 19 ControllerPairingScreenActor* actor,
20 ControllerPairingController* shark_controller) 20 ControllerPairingController* shark_controller)
21 : WizardScreen(observer), 21 : BaseScreen(observer),
22 actor_(actor), 22 actor_(actor),
23 shark_controller_(shark_controller), 23 shark_controller_(shark_controller),
24 current_stage_(ControllerPairingController::STAGE_NONE), 24 current_stage_(ControllerPairingController::STAGE_NONE),
25 device_preselected_(false) { 25 device_preselected_(false) {
26 actor_->SetDelegate(this); 26 actor_->SetDelegate(this);
27 shark_controller_->AddObserver(this); 27 shark_controller_->AddObserver(this);
28 } 28 }
29 29
30 ControllerPairingScreen::~ControllerPairingScreen() { 30 ControllerPairingScreen::~ControllerPairingScreen() {
31 if (actor_) 31 if (actor_)
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
199 ++key) { 199 ++key) {
200 if (*key == kContextKeySelectedDevice) { 200 if (*key == kContextKeySelectedDevice) {
201 context_.SetBoolean(kContextKeyControlsDisabled, 201 context_.SetBoolean(kContextKeyControlsDisabled,
202 context_.GetString(*key).empty()); 202 context_.GetString(*key).empty());
203 CommitContextChanges(); 203 CommitContextChanges();
204 } 204 }
205 } 205 }
206 } 206 }
207 207
208 } // namespace chromeos 208 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698