chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h - Issue 2446893008: NetworkHandler: Add ui_proxy_config_service

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/options/chromeos/core_chromeos_options_handler.h

Issue 2446893008: NetworkHandler: Add ui_proxy_config_service (Closed)

Patch Set: . Created 4 years, 1 month 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/net/network_pref_state_observer_unittest.cc ('K') | « chrome/browser/chromeos/proxy_cros_settings_parser.cc ('k') | chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc » ('j') | chromeos/network/network_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h

diff --git a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h

index 5bbb4fda89f5ef4efd2cab67809040d3226ab0b5..82df4831ee5f2b1c7aae2429ae972e04e0fbe703 100644

--- a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h

+++ b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.h

@@ -6,12 +6,12 @@

#define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_CORE_CHROMEOS_OPTIONS_HANDLER_H_

#include <map>

+#include <memory>

James Cook 2016/11/01 23:02:04 Why memory but not <string>?

stevenjb 2016/11/01 23:55:11 removed

#include "base/compiler_specific.h"

#include "base/memory/linked_ptr.h"

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

#include "chrome/browser/ui/webui/options/core_options_handler.h"

-#include "chromeos/network/proxy/ui_proxy_config_service.h"

#include "content/public/browser/notification_observer.h"

#include "content/public/browser/notification_registrar.h"

@@ -68,7 +68,8 @@ class CoreChromeOSOptionsHandler : public ::options::CoreOptionsHandler,

content::NotificationRegistrar notification_registrar_;

- UIProxyConfigService proxy_config_service_;

+ // Currently selected network id.

+ std::string network_guid_;

};

} // namespace options