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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // This class gathers state related to a single user profile. 5 // This class gathers state related to a single user profile.
6 6
7 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_ 7 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_
8 #define CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_ 8 #define CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_
9 #pragma once 9 #pragma once
10 10
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 virtual void ClearNetworkingHistorySince(base::Time time) OVERRIDE; 131 virtual void ClearNetworkingHistorySince(base::Time time) OVERRIDE;
132 132
133 #if defined(OS_CHROMEOS) 133 #if defined(OS_CHROMEOS)
134 virtual void ChangeAppLocale(const std::string& locale, 134 virtual void ChangeAppLocale(const std::string& locale,
135 AppLocaleChangedVia) OVERRIDE; 135 AppLocaleChangedVia) OVERRIDE;
136 virtual void OnLogin() OVERRIDE; 136 virtual void OnLogin() OVERRIDE;
137 virtual void SetupChromeOSEnterpriseExtensionObserver() OVERRIDE; 137 virtual void SetupChromeOSEnterpriseExtensionObserver() OVERRIDE;
138 virtual void InitChromeOSPreferences() OVERRIDE; 138 virtual void InitChromeOSPreferences() OVERRIDE;
139 #endif // defined(OS_CHROMEOS) 139 #endif // defined(OS_CHROMEOS)
140 140
141 virtual PrefProxyConfigTracker* GetProxyConfigTracker() OVERRIDE; 141 virtual PrefProxyConfigTrackerType* GetProxyConfigTracker() OVERRIDE;
142 142
143 // content::NotificationObserver implementation. 143 // content::NotificationObserver implementation.
144 virtual void Observe(int type, 144 virtual void Observe(int type,
145 const content::NotificationSource& source, 145 const content::NotificationSource& source,
146 const content::NotificationDetails& details) OVERRIDE; 146 const content::NotificationDetails& details) OVERRIDE;
147 147
148 private: 148 private:
149 friend class Profile; 149 friend class Profile;
150 150
151 ProfileImpl(const FilePath& path, 151 ProfileImpl(const FilePath& path,
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 276
277 #if defined(OS_CHROMEOS) 277 #if defined(OS_CHROMEOS)
278 scoped_ptr<chromeos::Preferences> chromeos_preferences_; 278 scoped_ptr<chromeos::Preferences> chromeos_preferences_;
279 279
280 scoped_ptr<chromeos::EnterpriseExtensionObserver> 280 scoped_ptr<chromeos::EnterpriseExtensionObserver>
281 chromeos_enterprise_extension_observer_; 281 chromeos_enterprise_extension_observer_;
282 282
283 scoped_ptr<chromeos::LocaleChangeGuard> locale_change_guard_; 283 scoped_ptr<chromeos::LocaleChangeGuard> locale_change_guard_;
284 #endif 284 #endif
285 285
286 scoped_refptr<PrefProxyConfigTracker> pref_proxy_config_tracker_; 286 scoped_ptr<PrefProxyConfigTrackerType> pref_proxy_config_tracker_;
287 287
288 scoped_ptr<ChromeURLDataManager> chrome_url_data_manager_; 288 scoped_ptr<ChromeURLDataManager> chrome_url_data_manager_;
289 289
290 Profile::Delegate* delegate_; 290 Profile::Delegate* delegate_;
291 291
292 chrome_browser_net::Predictor* predictor_; 292 chrome_browser_net::Predictor* predictor_;
293 293
294 DISALLOW_COPY_AND_ASSIGN(ProfileImpl); 294 DISALLOW_COPY_AND_ASSIGN(ProfileImpl);
295 }; 295 };
296 296
297 #endif // CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_ 297 #endif // CHROME_BROWSER_PROFILES_PROFILE_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698