Move AppWindow to extensions

chrome/browser/extensions/startup_helper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/startup_helper.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/sandboxed_unpacker.h"
 #include "chrome/browser/extensions/webstore_startup_installer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/chrome_extensions_client.h"
 #include "components/crx_file/id_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/extension.h"
 #include "ipc/ipc_message.h"
 
 #if defined(OS_WIN)
-#include "apps/app_window.h"
-#include "apps/app_window_registry.h"
+#include "extensions/browser/app_window/app_window.h"
+#include "extensions/browser/app_window/app_window_registry.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_util.h"
 #endif
 
 using content::BrowserThread;
 
 namespace {
 
 void PrintPackExtensionMessage(const std::string& message) {
   VLOG(1) << message;
@@ skipping 10 matching lines @@
 
 #if defined(OS_WIN)
   using extensions::ExtensionRegistry;
   ExtensionRegistry* registry = ExtensionRegistry::Get(profile);
   DCHECK(registry);
   if (!registry->GetExtensionById(app_id, ExtensionRegistry::EVERYTHING) ||
       !extensions::util::IsEphemeralApp(app_id, profile)) {
     return installer;
   }
 
-  apps::AppWindowRegistry* app_window_registry =
-      apps::AppWindowRegistry::Get(profile);
+  extensions::AppWindowRegistry* app_window_registry =
+      extensions::AppWindowRegistry::Get(profile);
   DCHECK(app_window_registry);
-  apps::AppWindow* app_window =
+  extensions::AppWindow* app_window =
       app_window_registry->GetCurrentAppWindowForApp(app_id);
   if (!app_window)
     return installer;
 
   installer = new extensions::WebstoreInstallWithPrompt(
       app_id, profile, app_window->GetNativeWindow(), callback);
 #endif
 
   return installer;
 }
@@ skipping 284 matching lines @@
   }
   return id;
 }
 
 StartupHelper::~StartupHelper() {
   if (pack_job_.get())
     pack_job_->ClearClient();
 }
 
 }  // namespace extensions