OLD | NEW |
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/host_pairing_screen.h" | 5 #include "chrome/browser/chromeos/login/screens/host_pairing_screen.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "chrome/browser/chromeos/login/wizard_controller.h" | 8 #include "chrome/browser/chromeos/login/wizard_controller.h" |
9 #include "chromeos/chromeos_switches.h" | 9 #include "chromeos/chromeos_switches.h" |
10 #include "chromeos/pairing/fake_host_pairing_controller.h" | 10 #include "components/pairing/fake_host_pairing_controller.h" |
11 | 11 |
12 namespace chromeos { | 12 namespace chromeos { |
13 | 13 |
14 using namespace host_pairing; | 14 using namespace host_pairing; |
| 15 using namespace pairing_chromeos; |
15 | 16 |
16 HostPairingScreen::HostPairingScreen(ScreenObserver* observer, | 17 HostPairingScreen::HostPairingScreen(ScreenObserver* observer, |
17 HostPairingScreenActor* actor) | 18 HostPairingScreenActor* actor) |
18 : WizardScreen(observer), | 19 : WizardScreen(observer), |
19 actor_(actor), | 20 actor_(actor), |
20 current_stage_(HostPairingController::STAGE_NONE) { | 21 current_stage_(HostPairingController::STAGE_NONE) { |
21 actor_->SetDelegate(this); | 22 actor_->SetDelegate(this); |
22 std::string controller_config = | 23 std::string controller_config = |
23 base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( | 24 base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII( |
24 switches::kShowHostPairingDemo); | 25 switches::kShowHostPairingDemo); |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 context_.SetDouble(kContextKeyUpdateProgress, progress.progress); | 118 context_.SetDouble(kContextKeyUpdateProgress, progress.progress); |
118 CommitContextChanges(); | 119 CommitContextChanges(); |
119 } | 120 } |
120 | 121 |
121 void HostPairingScreen::OnActorDestroyed(HostPairingScreenActor* actor) { | 122 void HostPairingScreen::OnActorDestroyed(HostPairingScreenActor* actor) { |
122 if (actor_ == actor) | 123 if (actor_ == actor) |
123 actor_ = NULL; | 124 actor_ = NULL; |
124 } | 125 } |
125 | 126 |
126 } // namespace chromeos | 127 } // namespace chromeos |
OLD | NEW |