diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-10 00:34:07 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-10 00:34:07 +0000 |
| commit | 98b6d9420a759464aa049afc8b84ac2ec3b9e578 (patch) | |
| tree | 823da23bb43bdc64aff79ea915d4f703cb0793e0 /extensions/browser/lazy_background_task_queue.cc | |
| parent | 3ba0e2489671e033b14e1e40d889835ab432f518 (diff) | |
| download | chromium_src-98b6d9420a759464aa049afc8b84ac2ec3b9e578.zip chromium_src-98b6d9420a759464aa049afc8b84ac2ec3b9e578.tar.gz chromium_src-98b6d9420a759464aa049afc8b84ac2ec3b9e578.tar.bz2 | |
Reland: Move ExtensionProcessManager to src/extensions, part 4
Reland of https://codereview.chromium.org/62713003/ - the original patch broke the Google Chrome OS official builder due to a missing dependency on the extensions api target in extensions/extensions.gyp.
* Move c/b/extensions/extension_process_manager.h to
extensions/browser/process_manager.h
* Rename ExtensionsProcessManager to ProcessManager
* Place it in the "extensions" namespace
BUG=313481
TEST=browser_tests, unit_tests
TBR=miket@chromium.org
Review URL: https://codereview.chromium.org/67253003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234149 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions/browser/lazy_background_task_queue.cc')
| -rw-r--r-- | extensions/browser/lazy_background_task_queue.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extensions/browser/lazy_background_task_queue.cc b/extensions/browser/lazy_background_task_queue.cc index a7b0066..28880cc 100644 --- a/extensions/browser/lazy_background_task_queue.cc +++ b/extensions/browser/lazy_background_task_queue.cc @@ -7,7 +7,6 @@ #include "base/callback.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/extension_host.h" -#include "chrome/browser/extensions/extension_process_manager.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/process_map.h" @@ -20,6 +19,7 @@ #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" #include "extensions/browser/extensions_browser_client.h" +#include "extensions/browser/process_manager.h" #include "extensions/common/manifest_handlers/background_info.h" #include "extensions/common/view_type.h" @@ -44,7 +44,7 @@ bool LazyBackgroundTaskQueue::ShouldEnqueueTask( const Extension* extension) { DCHECK(extension); if (BackgroundInfo::HasBackgroundPage(extension)) { - ExtensionProcessManager* pm = ExtensionSystem::GetForBrowserContext( + ProcessManager* pm = ExtensionSystem::GetForBrowserContext( browser_context)->process_manager(); DCHECK(pm); ExtensionHost* background_host = @@ -81,7 +81,7 @@ void LazyBackgroundTaskQueue::AddPendingTask( if (extension && BackgroundInfo::HasLazyBackgroundPage(extension)) { // If this is the first enqueued task, and we're not waiting for the // background page to unload, ensure the background page is loaded. - ExtensionProcessManager* pm = ExtensionSystem::GetForBrowserContext( + ProcessManager* pm = ExtensionSystem::GetForBrowserContext( browser_context)->process_manager(); pm->IncrementLazyKeepaliveCount(extension); // Creating the background host may fail, e.g. if |profile| is incognito |