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

Side by Side Diff: chrome/browser/profiles/profile.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_H_ 7 #ifndef CHROME_BROWSER_PROFILES_PROFILE_H_
8 #define CHROME_BROWSER_PROFILES_PROFILE_H_ 8 #define CHROME_BROWSER_PROFILES_PROFILE_H_
9 #pragma once 9 #pragma once
10 10
11 #include <string> 11 #include <string>
12 12
13 #include "base/basictypes.h" 13 #include "base/basictypes.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "chrome/browser/net/preconnect.h" // TODO: remove this. 15 #include "chrome/browser/net/preconnect.h" // TODO: remove this.
16 #include "chrome/common/extensions/extension_constants.h" 16 #include "chrome/common/extensions/extension_constants.h"
17 #include "content/browser/browser_context.h" 17 #include "content/browser/browser_context.h"
18 18
19 namespace base { 19 namespace base {
20 class Time; 20 class Time;
21 } 21 }
22 22
23 namespace chromeos { 23 namespace chromeos {
24 class LibCrosServiceLibraryImpl; 24 class LibCrosServiceLibraryImpl;
25 class ResetDefaultProxyConfigServiceTask; 25 class ResetDefaultProxyConfigServiceTask;
26 } 26 }
27 27
28 #if defined(OS_CHROMEOS)
29 namespace chromeos {
30 class ProxyConfigServiceImpl;
31 }
32 #endif // defined(OS_CHROMEOS)
33
28 namespace fileapi { 34 namespace fileapi {
29 class FileSystemContext; 35 class FileSystemContext;
30 class SandboxedFileSystemContext; 36 class SandboxedFileSystemContext;
31 } 37 }
32 38
33 namespace history { 39 namespace history {
34 class TopSites; 40 class TopSites;
35 class ShortcutsBackend; 41 class ShortcutsBackend;
36 } 42 }
37 43
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 class WebUI; 94 class WebUI;
89 95
90 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) && defined(OS_POSIX) 96 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) && defined(OS_POSIX)
91 // Local profile ids are used to associate resources stored outside the profile 97 // Local profile ids are used to associate resources stored outside the profile
92 // directory, like saved passwords in GNOME Keyring / KWallet, with a profile. 98 // directory, like saved passwords in GNOME Keyring / KWallet, with a profile.
93 // With high probability, they are unique on the local machine. They are almost 99 // With high probability, they are unique on the local machine. They are almost
94 // certainly not unique globally, by design. Do not send them over the network. 100 // certainly not unique globally, by design. Do not send them over the network.
95 typedef int LocalProfileId; 101 typedef int LocalProfileId;
96 #endif 102 #endif
97 103
104 #if defined(OS_CHROMEOS)
105 typedef chromeos::ProxyConfigServiceImpl PrefProxyConfigTrackerType;
106 #else
107 typedef PrefProxyConfigTracker PrefProxyConfigTrackerType;
108 #endif // defined(OS_CHROMEOS)
Mattias Nissler (ping if slow) 2011/10/24 10:18:28 I'm wondering whether we might even want to go a s
kuan 2011/10/25 02:01:54 Done.
109
98 class Profile : public content::BrowserContext { 110 class Profile : public content::BrowserContext {
99 public: 111 public:
100 // Profile services are accessed with the following parameter. This parameter 112 // Profile services are accessed with the following parameter. This parameter
101 // defines what the caller plans to do with the service. 113 // defines what the caller plans to do with the service.
102 // The caller is responsible for not performing any operation that would 114 // The caller is responsible for not performing any operation that would
103 // result in persistent implicit records while using an OffTheRecord profile. 115 // result in persistent implicit records while using an OffTheRecord profile.
104 // This flag allows the profile to perform an additional check. 116 // This flag allows the profile to perform an additional check.
105 // 117 //
106 // It also gives us an opportunity to perform further checks in the future. We 118 // It also gives us an opportunity to perform further checks in the future. We
107 // could, for example, return an history service that only allow some specific 119 // could, for example, return an history service that only allow some specific
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 484
473 // Creates ChromeOS's EnterpriseExtensionListener. 485 // Creates ChromeOS's EnterpriseExtensionListener.
474 virtual void SetupChromeOSEnterpriseExtensionObserver() = 0; 486 virtual void SetupChromeOSEnterpriseExtensionObserver() = 0;
475 487
476 // Initializes Chrome OS's preferences. 488 // Initializes Chrome OS's preferences.
477 virtual void InitChromeOSPreferences() = 0; 489 virtual void InitChromeOSPreferences() = 0;
478 #endif // defined(OS_CHROMEOS) 490 #endif // defined(OS_CHROMEOS)
479 491
480 // Returns the helper object that provides the proxy configuration service 492 // Returns the helper object that provides the proxy configuration service
481 // access to the the proxy configuration possibly defined by preferences. 493 // access to the the proxy configuration possibly defined by preferences.
482 virtual PrefProxyConfigTracker* GetProxyConfigTracker() = 0; 494 virtual PrefProxyConfigTrackerType* GetProxyConfigTracker() = 0;
483 495
484 // Returns the Predictor object used for dns prefetch. 496 // Returns the Predictor object used for dns prefetch.
485 virtual chrome_browser_net::Predictor* GetNetworkPredictor() = 0; 497 virtual chrome_browser_net::Predictor* GetNetworkPredictor() = 0;
486 498
487 // Deletes all network related data since |time|. It deletes transport 499 // Deletes all network related data since |time|. It deletes transport
488 // security state since |time| and it also delete HttpServerProperties data. 500 // security state since |time| and it also delete HttpServerProperties data.
489 // The implementation is free to run this on a background thread, so when this 501 // The implementation is free to run this on a background thread, so when this
490 // method returns data is not guaranteed to be deleted. 502 // method returns data is not guaranteed to be deleted.
491 virtual void ClearNetworkingHistorySince(base::Time time) = 0; 503 virtual void ClearNetworkingHistorySince(base::Time time) = 0;
492 504
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
564 struct hash<Profile*> { 576 struct hash<Profile*> {
565 std::size_t operator()(Profile* const& p) const { 577 std::size_t operator()(Profile* const& p) const {
566 return reinterpret_cast<std::size_t>(p); 578 return reinterpret_cast<std::size_t>(p);
567 } 579 }
568 }; 580 };
569 581
570 } // namespace __gnu_cxx 582 } // namespace __gnu_cxx
571 #endif 583 #endif
572 584
573 #endif // CHROME_BROWSER_PROFILES_PROFILE_H_ 585 #endif // CHROME_BROWSER_PROFILES_PROFILE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698