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 /chrome/browser/apps/window_controls_browsertest.cc | |
| 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 'chrome/browser/apps/window_controls_browsertest.cc')
| -rw-r--r-- | chrome/browser/apps/window_controls_browsertest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/apps/window_controls_browsertest.cc b/chrome/browser/apps/window_controls_browsertest.cc index 7da2e46..4d534a8 100644 --- a/chrome/browser/apps/window_controls_browsertest.cc +++ b/chrome/browser/apps/window_controls_browsertest.cc @@ -3,12 +3,12 @@ // found in the LICENSE file. #include "chrome/browser/apps/app_browsertest_util.h" +#include "chrome/browser/extensions/extension_process_manager.h" #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" #include "content/public/browser/web_contents_view.h" #include "content/public/test/browser_test_utils.h" -#include "extensions/browser/process_manager.h" class WindowControlsTest : public extensions::PlatformAppBrowserTest { protected: @@ -22,7 +22,7 @@ class WindowControlsTest : public extensions::PlatformAppBrowserTest { content::WebContents* WindowControlsTest::GetWebContentsForExtensionWindow( const extensions::Extension* extension) { - extensions::ProcessManager* process_manager = + ExtensionProcessManager* process_manager = extensions::ExtensionSystem::Get(profile())->process_manager(); // Lookup render view host for background page. @@ -32,9 +32,9 @@ content::WebContents* WindowControlsTest::GetWebContentsForExtensionWindow( extension_host->render_view_host(); // Go through all active views, looking for the first window of the extension - const extensions::ProcessManager::ViewSet all_views = + const ExtensionProcessManager::ViewSet all_views = process_manager->GetAllViews(); - extensions::ProcessManager::ViewSet::const_iterator it = all_views.begin(); + ExtensionProcessManager::ViewSet::const_iterator it = all_views.begin(); for (; it != all_views.end(); ++it) { content::RenderViewHost* host = *it; |