chrome/browser/automation/testing_automation_provider_chromeos.cc - Issue 14846004: Migrate ProxyConfigServiceImpl to NetworkStateHandler and NetworkProfileHandler.

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/automation/testing_automation_provider_chromeos.cc

Issue 14846004: Migrate ProxyConfigServiceImpl to NetworkStateHandler and NetworkProfileHandler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased. Created 7 years, 7 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

Index: chrome/browser/automation/testing_automation_provider_chromeos.cc

diff --git a/chrome/browser/automation/testing_automation_provider_chromeos.cc b/chrome/browser/automation/testing_automation_provider_chromeos.cc

index 357c0341d965aa2eeb9f093e2403820ba7161f89..946d5c0b2cfdad4e15ef5c00e824ceff05a45ebb 100644

--- a/chrome/browser/automation/testing_automation_provider_chromeos.cc

+++ b/chrome/browser/automation/testing_automation_provider_chromeos.cc

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

#include "chrome/browser/chromeos/settings/cros_settings.h"

#include "chrome/browser/chromeos/settings/cros_settings_names.h"

#include "chrome/browser/chromeos/system/timezone_settings.h"

+#include "chrome/browser/chromeos/ui_proxy_config_service.h"

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/browser_window.h"

#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"

@@ -753,7 +754,7 @@ void TestingAutomationProvider::RefreshInternetDetails(

reply.SendError("Unable to get proxy configuration.");

return;

}

- config_service->UISetCurrentNetwork(service_path);

+ config_service->GetUIService().SetCurrentNetwork(service_path);

reply.SendSuccess(NULL);

}

« no previous file with comments | « no previous file | chrome/browser/chromeos/cros/network_property_ui_data.h » ('j') | chrome/browser/chromeos/proxy_config_service_impl.cc » ('J')