chrome/browser/profiles/profile_impl.h - Issue 8102019: redesign and reimplement proxy config service and tracker, revise proxy ui on cros

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/profiles/profile_impl.h

Issue 8102019: redesign and reimplement proxy config service and tracker, revise proxy ui on cros (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 9 years, 2 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/net/proxy_service_factory.cc ('K') | « chrome/browser/profiles/profile.cc ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | chrome/browser/ui/webui/options/advanced_options_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/profile_impl.h

===================================================================

--- chrome/browser/profiles/profile_impl.h (revision 106059)

+++ chrome/browser/profiles/profile_impl.h (working copy)

@@ -138,7 +138,11 @@

virtual void InitChromeOSPreferences() OVERRIDE;

#endif // defined(OS_CHROMEOS)

+#if defined(OS_CHROMEOS)

+ virtual chromeos::ProxyConfigServiceImpl* GetProxyConfigTracker() OVERRIDE;

+#else

virtual PrefProxyConfigTracker* GetProxyConfigTracker() OVERRIDE;

+#endif // defined(OS_CHROMEOS)

// NotificationObserver implementation.

virtual void Observe(int type,

@@ -283,7 +287,11 @@

scoped_ptr<chromeos::LocaleChangeGuard> locale_change_guard_;

#endif

- scoped_refptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;

+#if defined(OS_CHROMEOS)

+ scoped_ptr<chromeos::ProxyConfigServiceImpl> pref_proxy_config_tracker_;

+#else

+ scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;

+#endif // defined(OS_CHROMEOS)

scoped_ptr<ChromeURLDataManager> chrome_url_data_manager_;