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 /apps | |
| 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 'apps')
| -rw-r--r-- | apps/launcher.cc | 4 | ||||
| -rw-r--r-- | apps/shell_window.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/launcher.cc b/apps/launcher.cc index 603ffb5..9e0f6cf 100644 --- a/apps/launcher.cc +++ b/apps/launcher.cc @@ -18,7 +18,6 @@ #include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/browser/extensions/extension_prefs.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/profiles/profile.h" @@ -30,6 +29,7 @@ #include "content/public/browser/render_process_host.h" #include "content/public/browser/web_contents.h" #include "extensions/browser/lazy_background_task_queue.h" +#include "extensions/browser/process_manager.h" #include "net/base/mime_util.h" #include "net/base/net_util.h" #include "url/gurl.h" @@ -270,7 +270,7 @@ class PlatformAppPathLauncher return; } - ExtensionProcessManager* process_manager = + extensions::ProcessManager* process_manager = ExtensionSystem::Get(profile_)->process_manager(); ExtensionHost* host = process_manager->GetBackgroundHostForExtension(extension_->id()); diff --git a/apps/shell_window.cc b/apps/shell_window.cc index 7eff4ce..ed41645 100644 --- a/apps/shell_window.cc +++ b/apps/shell_window.cc @@ -12,7 +12,6 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/chrome_notification_types.h" -#include "chrome/browser/extensions/extension_process_manager.h" #include "chrome/browser/extensions/extension_system.h" #include "chrome/browser/extensions/extension_web_contents_observer.h" #include "chrome/browser/extensions/suggest_permission_util.h" @@ -34,6 +33,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "content/public/common/media_stream_request.h" +#include "extensions/browser/process_manager.h" #include "extensions/browser/view_type_utils.h" #include "third_party/skia/include/core/SkRegion.h" #include "ui/gfx/screen.h" |