chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc - Issue 959503003: Remove ServiceDiscoveryClient* from PrivetHTTPAsynchronousFactoryImpl interface

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/ui/webui/local_discovery/local_discovery_ui_handler.cc

Issue 959503003: Remove ServiceDiscoveryClient* from PrivetHTTPAsynchronousFactoryImpl interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fixEstablish

Patch Set: Tue Feb 24 23:11:53 PST 2015 Created 5 years, 10 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

« no previous file with comments | « chrome/browser/local_discovery/privet_notifications.cc ('k') | chrome/browser/ui/webui/print_preview/print_preview_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc

diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc

index 33c9451c6a7fdc4671fe754eff08b2c3dbb64d83..0c9ac495a4a7e3b77c921257110b141d1b9fd8f4 100644

--- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc

+++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.cc

@@ -171,7 +171,7 @@ void LocalDiscoveryUIHandler::HandleStart(const base::ListValue* args) {

privet_lister_.reset(

new PrivetDeviceListerImpl(service_discovery_client_.get(), this));

privet_http_factory_ = PrivetHTTPAsynchronousFactory::CreateInstance(

- service_discovery_client_.get(), profile->GetRequestContext());

+ profile->GetRequestContext());

SigninManagerBase* signin_manager =

SigninManagerFactory::GetInstance()->GetForProfile(profile);

@@ -211,8 +211,7 @@ void LocalDiscoveryUIHandler::HandleRegisterDevice(

if (found->second.version < kCloudDevicesPrivetVersion) {

privet_resolution_ = privet_http_factory_->CreatePrivetHTTP(

- device,

- found->second.address,

+ device, found->second.address,

base::Bind(&LocalDiscoveryUIHandler::StartRegisterHTTP,

base::Unretained(this)));

privet_resolution_->Start();