Rename apps::ShellWindow to apps::AppWindow

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

 // Copyright 2013 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/native_app_window_views_win.h"
 
-#include "apps/shell_window.h"
-#include "apps/shell_window_registry.h"
+#include "apps/app_window.h"
+#include "apps/app_window_registry.h"
 #include "ash/shell.h"
 #include "chrome/browser/apps/per_app_settings_service.h"
 #include "chrome/browser/apps/per_app_settings_service_factory.h"
 #include "chrome/browser/metro_utils/metro_chrome_win.h"
 #include "extensions/common/extension.h"
 #include "ui/aura/remote_window_tree_host_win.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 
 NativeAppWindowViewsWin::NativeAppWindowViewsWin() {
 }
@@ skipping 12 matching lines @@
   if (host_desktop_type == chrome::HOST_DESKTOP_TYPE_ASH &&
       chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_NATIVE) {
     chrome::ActivateMetroChrome();
   }
 }
 
 void NativeAppWindowViewsWin::OnBeforeWidgetInit(
     views::Widget::InitParams* init_params, views::Widget* widget) {
   // If an app has any existing windows, ensure new ones are created on the
   // same desktop.
-  apps::ShellWindow* any_existing_window =
-      apps::ShellWindowRegistry::Get(browser_context())
-          ->GetCurrentShellWindowForApp(extension()->id());
+  apps::AppWindow* any_existing_window =
+      apps::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 {
@@ skipping 10 matching lines @@
 
 void NativeAppWindowViewsWin::Show() {
   ActivateParentDesktopIfNecessary();
   NativeAppWindowViews::Show();
 }
 
 void NativeAppWindowViewsWin::Activate() {
   ActivateParentDesktopIfNecessary();
   NativeAppWindowViews::Activate();
 }