Move AppWindow to extensions

chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc

 // Copyright 2014 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/ui/views/apps/chrome_native_app_window_views_win.h"
 
-#include "apps/app_window.h"
-#include "apps/app_window_registry.h"
 #include "apps/ui/views/app_window_frame_view.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/apps/per_app_settings_service.h"
 #include "chrome/browser/apps/per_app_settings_service_factory.h"
 #include "chrome/browser/jumplist_updater_win.h"
 #include "chrome/browser/metro_utils/metro_chrome_win.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/ui/views/apps/app_window_desktop_native_widget_aura_win.h"
 #include "chrome/browser/ui/views/apps/glass_app_window_frame_view_win.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/browser/web_applications/web_app_win.h"
 #include "chrome/common/chrome_icon_resources_win.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/grit/generated_resources.h"
 #include "content/public/browser/browser_thread.h"
+#include "extensions/browser/app_window/app_window.h"
+#include "extensions/browser/app_window/app_window_registry.h"
 #include "extensions/browser/extension_util.h"
 #include "extensions/common/extension.h"
 #include "ui/aura/remote_window_tree_host_win.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/win/shell.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/win/hwnd_util.h"
 
 ChromeNativeAppWindowViewsWin::ChromeNativeAppWindowViewsWin()
     : weak_ptr_factory_(this), glass_frame_view_(NULL) {
@@ skipping 33 matching lines @@
   ::SetWindowLong(hwnd, GWL_STYLE, current_style | WS_CAPTION);
 }
 
 void ChromeNativeAppWindowViewsWin::OnBeforeWidgetInit(
     views::Widget::InitParams* init_params,
     views::Widget* widget) {
   content::BrowserContext* browser_context = app_window()->browser_context();
   std::string extension_id = app_window()->extension_id();
   // If an app has any existing windows, ensure new ones are created on the
   // same desktop.
-  apps::AppWindow* any_existing_window =
-      apps::AppWindowRegistry::Get(browser_context)
+  extensions::AppWindow* any_existing_window =
+      extensions::AppWindowRegistry::Get(browser_context)
           ->GetCurrentAppWindowForApp(extension_id);
   chrome::HostDesktopType desktop_type;
   if (any_existing_window) {
     desktop_type = chrome::GetHostDesktopTypeForNativeWindow(
         any_existing_window->GetNativeWindow());
   } else {
     PerAppSettingsService* settings =
         PerAppSettingsServiceFactory::GetForBrowserContext(browser_context);
     if (settings->HasDesktopLastLaunchedFrom(extension_id)) {
       desktop_type = settings->GetDesktopLastLaunchedFrom(extension_id);
     } else {
       // We don't know what desktop this app was last launched from, so take our
       // best guess as to what desktop the user is on.
       desktop_type = chrome::GetActiveDesktop();
     }
   }
   if (desktop_type == chrome::HOST_DESKTOP_TYPE_ASH)
     init_params->context = ash::Shell::GetPrimaryRootWindow();
   else
     init_params->native_widget = new AppWindowDesktopNativeWidgetAuraWin(this);
 }
 
 void ChromeNativeAppWindowViewsWin::InitializeDefaultWindow(
-    const apps::AppWindow::CreateParams& create_params) {
+    const extensions::AppWindow::CreateParams& create_params) {
   ChromeNativeAppWindowViews::InitializeDefaultWindow(create_params);
 
   const extensions::Extension* extension = app_window()->GetExtension();
   if (!extension)
     return;
 
   std::string app_name =
       web_app::GenerateApplicationNameFromExtensionId(extension->id());
   base::string16 app_name_wide = base::UTF8ToWide(app_name);
   HWND hwnd = GetNativeAppWindowHWND();
@@ skipping 68 matching lines @@
                                               extension->id());
 
     ShellLinkItemList items;
     items.push_back(link);
     jumplist_updater.AddTasks(items);
   }
 
   // Note that an empty jumplist must still be committed to clear all items.
   jumplist_updater.CommitUpdate();
 }