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

Unified Diff: chrome/browser/chromeos/ui_proxy_config_service.cc

Issue 275543005: Use GUID instead of ServicePath in networkingPrivate API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 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
« no previous file with comments | « no previous file | chrome/browser/extensions/api/networking_private/networking_private_api_chromeos.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/ui_proxy_config_service.cc
diff --git a/chrome/browser/chromeos/ui_proxy_config_service.cc b/chrome/browser/chromeos/ui_proxy_config_service.cc
index 66195090694847454380651d15f2a73776fe740b..945f4e4b853dff612fda6e455788cb41260f9e11 100644
--- a/chrome/browser/chromeos/ui_proxy_config_service.cc
+++ b/chrome/browser/chromeos/ui_proxy_config_service.cc
@@ -81,8 +81,10 @@ void UIProxyConfigService::SetCurrentNetwork(
void UIProxyConfigService::UpdateFromPrefs() {
const FavoriteState* network = NULL;
if (!current_ui_network_.empty()) {
- network = NetworkHandler::Get()->network_state_handler()->GetFavoriteState(
- current_ui_network_);
+ network = NetworkHandler::Get()
+ ->network_state_handler()
+ ->GetFavoriteStateFromServicePath(current_ui_network_,
+ true /* configured_only */);
LOG_IF(ERROR, !network) << "Couldn't find FavoriteState for network "
<< current_ui_network_;
}
@@ -109,8 +111,10 @@ void UIProxyConfigService::SetProxyConfig(const UIProxyConfig& config) {
return;
const FavoriteState* network =
- NetworkHandler::Get()->network_state_handler()->GetFavoriteState(
- current_ui_network_);
+ NetworkHandler::Get()
+ ->network_state_handler()
+ ->GetFavoriteStateFromServicePath(current_ui_network_,
+ true /* configured_only */);
if (!network) {
LOG(ERROR) << "Couldn't find FavoriteState for network "
<< current_ui_network_;
« no previous file with comments | « no previous file | chrome/browser/extensions/api/networking_private/networking_private_api_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698