diff options
author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-30 06:53:29 +0000 |
---|---|---|
committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-30 06:53:29 +0000 |
commit | b24fd81740b596b2d3354e2a1904ba9b59a673f9 (patch) | |
tree | f39c5a85f5e0a7f8178062b963fe3de0dfcad505 /chrome/browser | |
parent | 1611e3593ac619558f269009d9454d1a67a21720 (diff) | |
download | chromium_src-b24fd81740b596b2d3354e2a1904ba9b59a673f9.zip chromium_src-b24fd81740b596b2d3354e2a1904ba9b59a673f9.tar.gz chromium_src-b24fd81740b596b2d3354e2a1904ba9b59a673f9.tar.bz2 |
Merge 33269 - Revert 33255 Report active extensions in crash reports. This only implements Windows right now. Mac and linux will be separate CLs.
"Active" is overloaded to mean different things depending on
the process type:
browser: all enabled extensions
renderer: unique set of extensions from all user scripts
extension: extensions running in the process
BUG=27169
Review URL: http://codereview.chromium.org/437078
There are thousands of new crashes with reivison 33256 and 33255, so i'm
reverting. the crashes are in chrome_2610000!child_process_logging::SetActiveURL
TBR=aa@chromium.org
Review URL: http://codereview.chromium.org/448006
TBR=nsylvain@chromium.org
Review URL: http://codereview.chromium.org/451005
git-svn-id: svn://svn.chromium.org/chrome/branches/249/src@33274 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r-- | chrome/browser/extensions/extensions_service.cc | 13 | ||||
-rw-r--r-- | chrome/browser/extensions/extensions_service.h | 3 | ||||
-rw-r--r-- | chrome/browser/renderer_host/browser_render_process_host.cc | 8 |
3 files changed, 0 insertions, 24 deletions
diff --git a/chrome/browser/extensions/extensions_service.cc b/chrome/browser/extensions/extensions_service.cc index 078b1b7..c254b92 100644 --- a/chrome/browser/extensions/extensions_service.cc +++ b/chrome/browser/extensions/extensions_service.cc @@ -24,7 +24,6 @@ #include "chrome/browser/extensions/external_pref_extension_provider.h" #include "chrome/browser/profile.h" #include "chrome/browser/net/chrome_url_request_context.h" -#include "chrome/common/child_process_logging.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" @@ -410,8 +409,6 @@ void ExtensionsService::NotifyExtensionLoaded(Extension* extension) { void ExtensionsService::NotifyExtensionUnloaded(Extension* extension) { LOG(INFO) << "Sending EXTENSION_UNLOADED"; - UpdateActiveExtensionsInCrashReporter(); - NotificationService::current()->Notify( NotificationType::EXTENSION_UNLOADED, Source<Profile>(profile_), @@ -619,16 +616,6 @@ void ExtensionsService::OnExtensionLoaded(Extension* extension, break; } } - - UpdateActiveExtensionsInCrashReporter(); -} - -void ExtensionsService::UpdateActiveExtensionsInCrashReporter() { - std::vector<std::string> extension_ids; - for (size_t i = 0; i < extensions_.size(); ++i) - extension_ids.push_back(extensions_[i]->id()); - - child_process_logging::SetActiveExtensions(extension_ids); } void ExtensionsService::OnExtensionInstalled(Extension* extension, diff --git a/chrome/browser/extensions/extensions_service.h b/chrome/browser/extensions/extensions_service.h index b848d0b..4a91fff 100644 --- a/chrome/browser/extensions/extensions_service.h +++ b/chrome/browser/extensions/extensions_service.h @@ -253,9 +253,6 @@ class ExtensionsService // Handles sending notification that |extension| was unloaded. void NotifyExtensionUnloaded(Extension* extension); - // Helper that updates the active extension list used for crash reporting. - void UpdateActiveExtensionsInCrashReporter(); - // The profile this ExtensionsService is part of. Profile* profile_; diff --git a/chrome/browser/renderer_host/browser_render_process_host.cc b/chrome/browser/renderer_host/browser_render_process_host.cc index 534991a..31736f9 100644 --- a/chrome/browser/renderer_host/browser_render_process_host.cc +++ b/chrome/browser/renderer_host/browser_render_process_host.cc @@ -584,14 +584,6 @@ void BrowserRenderProcessHost::InitExtensions() { void BrowserRenderProcessHost::SendUserScriptsUpdate( base::SharedMemory *shared_memory) { - // Don't send user scripts to extension processes. We currently don't allow - // user scripts to run in extensions, so it would be pointless. It would also - // mess up the crash reporting, which sends a different set of "active" - // extensions depending on whether the process is an extension or renderer - // process. - if (extension_process_) - return; - // Process is being started asynchronously. We'll end up calling // InitUserScripts when it's created which will call this again. if (child_process_.get() && child_process_->IsStarting()) |