diff options
| author | rockot@google.com <rockot@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-08 19:48:24 +0000 |
|---|---|---|
| committer | rockot@google.com <rockot@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-08 19:48:24 +0000 |
| commit | 069b0203a8374b8c9b4e4df3e75b16724d99eaf2 (patch) | |
| tree | 5eab9caa4b38fc054f0bb026235b865b44c6e59d /apps | |
| parent | 98f49e49ef42b91b0e6c05c9c9f2132fb7e5fcc9 (diff) | |
| download | chromium_src-069b0203a8374b8c9b4e4df3e75b16724d99eaf2.zip chromium_src-069b0203a8374b8c9b4e4df3e75b16724d99eaf2.tar.gz chromium_src-069b0203a8374b8c9b4e4df3e75b16724d99eaf2.tar.bz2 | |
Revert 233956 "Move ExtensionProcessManager to src/extensions, p..."
Compile error, runtime.h has moved?
> Move ExtensionProcessManager to src/extensions, part 4
>
> * 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
> R=miket@chromium.org
> TBR=sky@chromium.org for mechanical header file move affecting chrome/browser/
>
> Review URL: https://codereview.chromium.org/62713003
TBR=jamescook@chromium.org
Review URL: https://codereview.chromium.org/66213006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233959 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 9e0f6cf..603ffb5 100644 --- a/apps/launcher.cc +++ b/apps/launcher.cc @@ -18,6 +18,7 @@ #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" @@ -29,7 +30,6 @@ #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; } - extensions::ProcessManager* process_manager = + ExtensionProcessManager* 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 ed41645..7eff4ce 100644 --- a/apps/shell_window.cc +++ b/apps/shell_window.cc @@ -12,6 +12,7 @@ #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" @@ -33,7 +34,6 @@ #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" |