chromeos/network/network_state.h - Issue 14134007: NetworkPortalDetector/NetworkStateInformer: Switch over to use NetworkStateHandler

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: chromeos/network/network_state.h

Issue 14134007: NetworkPortalDetector/NetworkStateInformer: Switch over to use NetworkStateHandler (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: add proxy_config Created 7 years, 8 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/ui/webui/chromeos/login/signin_screen_handler.cc ('K') | « chromeos/dbus/shill_service_client_stub.cc ('k') | chromeos/network/network_state.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chromeos/network/network_state.h

diff --git a/chromeos/network/network_state.h b/chromeos/network/network_state.h

index 1e89638961f78c716dbf5992b0f6509c6a86f522..35171fd0d01eaef5f01404774484aa22d5ab68dc 100644

--- a/chromeos/network/network_state.h

+++ b/chromeos/network/network_state.h

@@ -45,6 +45,7 @@ class CHROMEOS_EXPORT NetworkState : public ManagedState {

const std::string& guid() const { return guid_; }

const std::string& connection_state() const { return connection_state_; }

const std::string& profile_path() const { return profile_path_; }

+ const std::string& proxy_config() const { return proxy_config_; }

const std::string& error() const { return error_; }

bool auto_connect() const { return auto_connect_; }

bool favorite() const { return favorite_; }

@@ -92,6 +93,7 @@ class CHROMEOS_EXPORT NetworkState : public ManagedState {

std::string guid_;

std::string connection_state_;

std::string profile_path_;

+ std::string proxy_config_;

std::string error_;

bool auto_connect_;

bool favorite_;