Index: chrome/browser/profiles/profile_io_data.h |
diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h |
index bb1e049bc83159c91f6742b00dc882099c4e3cba..34d2f2054d98f232969078e127f41dfa82599f76 100644 |
--- a/chrome/browser/profiles/profile_io_data.h |
+++ b/chrome/browser/profiles/profile_io_data.h |
@@ -34,6 +34,7 @@ class ProxyService; |
class SSLConfigService; |
class TransportSecurityState; |
} // namespace net |
+template<class T> class PrefMember; |
namespace prerender { |
class PrerenderManager; |
}; // namespace prerender |
@@ -42,6 +43,8 @@ namespace webkit_database { |
class DatabaseTracker; |
} // webkit_database |
+typedef PrefMember<bool> BooleanPrefMember; |
+ |
// Conceptually speaking, the ProfileIOData represents data that lives on the IO |
// thread that is owned by a Profile, such as, but not limited to, network |
// objects like CookieMonster, HttpTransactionFactory, etc. The Profile |
@@ -116,7 +119,7 @@ class ProfileIOData : public base::RefCountedThreadSafe<ProfileIOData> { |
ProfileId profile_id; |
}; |
- explicit ProfileIOData(bool is_incognito); |
+ explicit ProfileIOData(Profile* profile, bool is_incognito); |
willchan no longer on Chromium
2011/04/12 16:34:18
Not explicit anymore.
I have to say, I resisted a
Bernhard Bauer
2011/04/12 20:26:05
Hmm, I could initialize the BooleanPrefMember in t
willchan no longer on Chromium
2011/04/12 22:43:07
Yes, I would be fine with that. That's what I refe
Bernhard Bauer
2011/04/13 11:17:20
OK, done (in ChromeNetworkDelegate now, so it can
|
virtual ~ProfileIOData(); |
// Static helper functions to assist in common operations executed by |
@@ -132,6 +135,7 @@ class ProfileIOData : public base::RefCountedThreadSafe<ProfileIOData> { |
// functions have been provided to assist in common operations. |
void LazyInitialize() const; |
+ protected: |
willchan no longer on Chromium
2011/04/12 16:34:18
Look at line 73, there's already a protected secti
Bernhard Bauer
2011/04/13 11:17:20
Oops, done.
|
// -------------------------------------------- |
// Virtual interface for subtypes to implement: |
// -------------------------------------------- |
@@ -159,6 +163,15 @@ class ProfileIOData : public base::RefCountedThreadSafe<ProfileIOData> { |
scoped_refptr<ChromeURLRequestContext> main_context, |
const std::string& app_id) const = 0; |
+ // Called when the profile is destroyed. |
+ void Shutdown(); |
willchan no longer on Chromium
2011/04/12 16:34:18
ShutdownOnUI()
Bernhard Bauer
2011/04/13 11:17:20
Done.
|
+ |
+ BooleanPrefMember* enable_referrers() const { |
+ return enable_referrers_.get(); |
+ } |
+ |
+ private: |
+ scoped_ptr<BooleanPrefMember> enable_referrers_; |
willchan no longer on Chromium
2011/04/12 16:34:18
Why use a pointer? Can't we just directly embed th
Bernhard Bauer
2011/04/13 11:17:20
Very nice! Done.
|
mutable bool initialized_; |
DISALLOW_COPY_AND_ASSIGN(ProfileIOData); |