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

Side by Side Diff: chrome/browser/chromeos/login/screens/controller_pairing_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 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/stl_util.h" 8 #include "base/stl_util.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/browser/chromeos/login/wizard_controller.h" 10 #include "chrome/browser/chromeos/login/wizard_controller.h"
11 #include "google_apis/gaia/gaia_auth_util.h" 11 #include "google_apis/gaia/gaia_auth_util.h"
12 12
13 using namespace chromeos::controller_pairing; 13 using namespace chromeos::controller_pairing;
14 using namespace pairing_chromeos; 14 using namespace pairing_chromeos;
15 15
16 namespace chromeos { 16 namespace chromeos {
17 17
18 ControllerPairingScreen::ControllerPairingScreen( 18 ControllerPairingScreen::ControllerPairingScreen(
19 BaseScreenDelegate* base_screen_delegate, 19 BaseScreenDelegate* base_screen_delegate,
20 Delegate* delegate, 20 Delegate* delegate,
21 ControllerPairingScreenActor* actor, 21 ControllerPairingScreenActor* actor,
22 ControllerPairingController* shark_controller) 22 ControllerPairingController* shark_controller)
23 : BaseScreen(base_screen_delegate, 23 : BaseScreen(base_screen_delegate,
24 WizardController::kControllerPairingScreenName), 24 OobeScreen::SCREEN_OOBE_CONTROLLER_PAIRING),
25 delegate_(delegate), 25 delegate_(delegate),
26 actor_(actor), 26 actor_(actor),
27 shark_controller_(shark_controller), 27 shark_controller_(shark_controller),
28 current_stage_(ControllerPairingController::STAGE_NONE), 28 current_stage_(ControllerPairingController::STAGE_NONE),
29 device_preselected_(false) { 29 device_preselected_(false) {
30 actor_->SetDelegate(this); 30 actor_->SetDelegate(this);
31 shark_controller_->AddObserver(this); 31 shark_controller_->AddObserver(this);
32 } 32 }
33 33
34 ControllerPairingScreen::~ControllerPairingScreen() { 34 ControllerPairingScreen::~ControllerPairingScreen() {
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 ++key) { 209 ++key) {
210 if (*key == kContextKeySelectedDevice) { 210 if (*key == kContextKeySelectedDevice) {
211 context_.SetBoolean(kContextKeyControlsDisabled, 211 context_.SetBoolean(kContextKeyControlsDisabled,
212 context_.GetString(*key).empty()); 212 context_.GetString(*key).empty());
213 CommitContextChanges(); 213 CommitContextChanges();
214 } 214 }
215 } 215 }
216 } 216 }
217 217
218 } // namespace chromeos 218 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698