Index: chrome/browser/ui/webui/extensions/extension_settings_handler.cc |
diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc |
index 87f8a3f36844f54f833d0421a7037ae9a4f32f73..334420a2b8b4e30982171c95832e4c6d72417bcf 100644 |
--- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc |
+++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc |
@@ -5,8 +5,6 @@ |
#include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" |
#include "apps/app_load_service.h" |
-#include "apps/app_window.h" |
-#include "apps/app_window_registry.h" |
#include "apps/saved_files_service.h" |
#include "base/auto_reset.h" |
#include "base/base64.h" |
@@ -73,6 +71,8 @@ |
#include "content/public/browser/web_contents.h" |
#include "content/public/browser/web_ui.h" |
#include "content/public/browser/web_ui_data_source.h" |
+#include "extensions/browser/app_window/app_window.h" |
+#include "extensions/browser/app_window/app_window_registry.h" |
#include "extensions/browser/blacklist_state.h" |
#include "extensions/browser/extension_error.h" |
#include "extensions/browser/extension_host.h" |
@@ -1364,15 +1364,15 @@ void ExtensionSettingsHandler::GetAppWindowPagesForExtensionProfile( |
const Extension* extension, |
Profile* profile, |
std::vector<ExtensionPage>* result) { |
- apps::AppWindowRegistry* registry = apps::AppWindowRegistry::Get(profile); |
+ AppWindowRegistry* registry = AppWindowRegistry::Get(profile); |
if (!registry) return; |
- const apps::AppWindowRegistry::AppWindowList windows = |
+ const AppWindowRegistry::AppWindowList windows = |
registry->GetAppWindowsForApp(extension->id()); |
bool has_generated_background_page = |
BackgroundInfo::HasGeneratedBackgroundPage(extension); |
- for (apps::AppWindowRegistry::const_iterator it = windows.begin(); |
+ for (AppWindowRegistry::const_iterator it = windows.begin(); |
it != windows.end(); |
++it) { |
WebContents* web_contents = (*it)->web_contents(); |