Index: chrome/browser/automation/automation_provider_observers.cc |
diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc |
index b6db935438a31f1ad8b67760748ab13400520ae8..b692a776a2fda0020138c93455cc42c93f83390e 100644 |
--- a/chrome/browser/automation/automation_provider_observers.cc |
+++ b/chrome/browser/automation/automation_provider_observers.cc |
@@ -32,7 +32,6 @@ |
#include "chrome/browser/content_settings/tab_specific_content_settings.h" |
#include "chrome/browser/extensions/crx_installer.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/extension_tab_util.h" |
@@ -77,6 +76,7 @@ |
#include "content/public/browser/render_view_host.h" |
#include "content/public/browser/web_contents.h" |
#include "content/public/common/process_type.h" |
+#include "extensions/browser/process_manager.h" |
#include "extensions/common/manifest.h" |
#include "extensions/common/view_type.h" |
#include "ui/gfx/codec/png_codec.h" |
@@ -522,9 +522,9 @@ void TabCountChangeObserver::CheckTabCount() { |
delete this; |
} |
-bool DidExtensionViewsStopLoading(ExtensionProcessManager* manager) { |
- ExtensionProcessManager::ViewSet all_views = manager->GetAllViews(); |
- for (ExtensionProcessManager::ViewSet::const_iterator iter = |
+bool DidExtensionViewsStopLoading(extensions::ProcessManager* manager) { |
+ extensions::ProcessManager::ViewSet all_views = manager->GetAllViews(); |
+ for (extensions::ProcessManager::ViewSet::const_iterator iter = |
all_views.begin(); |
iter != all_views.end(); ++iter) { |
if ((*iter)->IsLoading()) |
@@ -591,7 +591,7 @@ void ExtensionUninstallObserver::Observe( |
} |
ExtensionReadyNotificationObserver::ExtensionReadyNotificationObserver( |
- ExtensionProcessManager* manager, ExtensionService* service, |
+ extensions::ProcessManager* manager, ExtensionService* service, |
AutomationProvider* automation, IPC::Message* reply_message) |
: manager_(manager), |
service_(service), |
@@ -691,7 +691,7 @@ void ExtensionUnloadNotificationObserver::Observe( |
} |
ExtensionsUpdatedObserver::ExtensionsUpdatedObserver( |
- ExtensionProcessManager* manager, AutomationProvider* automation, |
+ extensions::ProcessManager* manager, AutomationProvider* automation, |
IPC::Message* reply_message) |
: manager_(manager), automation_(automation->AsWeakPtr()), |
reply_message_(reply_message), updater_finished_(false) { |