chrome/browser/chromeos/login/screens/controller_pairing_screen.cc - Issue 539733002: Move ownership of the ControllerPairingController into the WizardController.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/screens/controller_pairing_screen.cc

Issue 539733002: Move ownership of the ControllerPairingController into the WizardController. (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 side-by-side diff with in-line comments

Download patch

« chrome/browser/chromeos/login/screens/controller_pairing_screen.h ('K') | « chrome/browser/chromeos/login/screens/controller_pairing_screen.h ('k') | chrome/browser/chromeos/login/wizard_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/screens/controller_pairing_screen.cc

diff --git a/chrome/browser/chromeos/login/screens/controller_pairing_screen.cc b/chrome/browser/chromeos/login/screens/controller_pairing_screen.cc

index 4563a16fdc0cccb92312a7bb88f2f47f8fac2b40..382ad45be58bd495837f7866c32e744b537f24dd 100644

--- a/chrome/browser/chromeos/login/screens/controller_pairing_screen.cc

+++ b/chrome/browser/chromeos/login/screens/controller_pairing_screen.cc

@@ -7,7 +7,6 @@

#include "base/command_line.h"

#include "base/values.h"

#include "chrome/browser/chromeos/login/wizard_controller.h"

-#include "components/pairing/bluetooth_controller_pairing_controller.h"

#include "google_apis/gaia/gaia_auth_util.h"

using namespace chromeos::controller_pairing;

@@ -21,13 +20,14 @@ namespace chromeos {

ControllerPairingScreen::ControllerPairingScreen(

ScreenObserver* observer,

- ControllerPairingScreenActor* actor)

+ ControllerPairingScreenActor* actor,

+ ControllerPairingController* controller)

: WizardScreen(observer),

actor_(actor),

+ controller_(controller),

current_stage_(ControllerPairingController::STAGE_NONE),

device_preselected_(false) {

actor_->SetDelegate(this);

- controller_.reset(new BluetoothControllerPairingController());

controller_->AddObserver(this);

}