summaryrefslogtreecommitdiffstats
path: root/chrome/browser/profile.cc
diff options
context:
space:
mode:
authormpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-11 00:05:34 +0000
committermpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-11 00:05:34 +0000
commit1bd5413c93779467e15c402e5bb1c866792bcac6 (patch)
tree19615d0f974d67abadd8464d188c5a8a02b84fe0 /chrome/browser/profile.cc
parentd9fac60990a817c7ef7f1a7beef90dc319bf299b (diff)
downloadchromium_src-1bd5413c93779467e15c402e5bb1c866792bcac6.zip
chromium_src-1bd5413c93779467e15c402e5bb1c866792bcac6.tar.gz
chromium_src-1bd5413c93779467e15c402e5bb1c866792bcac6.tar.bz2
Disable extensions in incognito mode.
Add a browsertest to make sure we don't crash with an incognito window open. Had to finagle utility_process_host to make it work in a browsertest. BUG=12326 TEST=none Review URL: http://codereview.chromium.org/118476 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18116 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profile.cc')
-rw-r--r--chrome/browser/profile.cc9
1 files changed, 2 insertions, 7 deletions
diff --git a/chrome/browser/profile.cc b/chrome/browser/profile.cc
index b7bd98d..1aed4ee 100644
--- a/chrome/browser/profile.cc
+++ b/chrome/browser/profile.cc
@@ -120,8 +120,6 @@ class OffTheRecordProfileImpl : public Profile,
request_context_ = ChromeURLRequestContext::CreateOffTheRecord(this);
request_context_->AddRef();
- extension_process_manager_.reset(new ExtensionProcessManager(this));
-
// Register for browser close notifications so we can detect when the last
// off-the-record window is closed, in which case we can clean our states
// (cookies, downloads...).
@@ -160,7 +158,7 @@ class OffTheRecordProfileImpl : public Profile,
}
virtual ExtensionsService* GetExtensionsService() {
- return profile_->GetExtensionsService();
+ return NULL;
}
virtual UserScriptMaster* GetUserScriptMaster() {
@@ -168,7 +166,7 @@ class OffTheRecordProfileImpl : public Profile,
}
virtual ExtensionProcessManager* GetExtensionProcessManager() {
- return extension_process_manager_.get();
+ return NULL;
}
virtual SSLHostState* GetSSLHostState() {
@@ -401,9 +399,6 @@ class OffTheRecordProfileImpl : public Profile,
// The ForceTLSState that only stores enabled sites in memory.
scoped_ptr<net::ForceTLSState> force_tls_state_;
- // Extensions run in a different context in incognito mode.
- scoped_ptr<ExtensionProcessManager> extension_process_manager_;
-
// Time we were started.
Time start_time_;