Removal of ash related code from chrome_native_app_window_views_win

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/ui/views/app_window_frame_view.h"
-#include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/files/file_util.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/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"
@@ skipping 16 matching lines @@
     : glass_frame_view_(NULL), is_translucent_(false), weak_ptr_factory_(this) {
 }
 
 ChromeNativeAppWindowViewsWin::~ChromeNativeAppWindowViewsWin() {
 }
 
 HWND ChromeNativeAppWindowViewsWin::GetNativeAppWindowHWND() const {
   return views::HWNDForWidget(widget()->GetTopLevelWidget());
 }
 
-bool ChromeNativeAppWindowViewsWin::IsRunningInAsh() {
-  if (!ash::Shell::HasInstance())
-    return false;
-
-  views::Widget* widget = GetWidget();
-  chrome::HostDesktopType host_desktop_type =
-      chrome::GetHostDesktopTypeForNativeWindow(widget->GetNativeWindow());
-  return host_desktop_type == chrome::HOST_DESKTOP_TYPE_ASH;
-}
-
 void ChromeNativeAppWindowViewsWin::EnsureCaptionStyleSet() {
   // Windows seems to have issues maximizing windows without WS_CAPTION.
   // The default views / Aura implementation will remove this if we are using
   // frameless or colored windows, so we put it back here.
   HWND hwnd = GetNativeAppWindowHWND();
   int current_style = ::GetWindowLong(hwnd, GWL_STYLE);
   ::SetWindowLong(hwnd, GWL_STYLE, current_style | WS_CAPTION);
 }
 
 void ChromeNativeAppWindowViewsWin::OnBeforeWidgetInit(
@@ skipping 18 matching lines @@
     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);
+  init_params->native_widget = new AppWindowDesktopNativeWidgetAuraWin(this);
 
   is_translucent_ =
       init_params->opacity == views::Widget::InitParams::TRANSLUCENT_WINDOW;
 }
 
 void ChromeNativeAppWindowViewsWin::InitializeDefaultWindow(
     const extensions::AppWindow::CreateParams& create_params) {
   ChromeNativeAppWindowViewsAura::InitializeDefaultWindow(create_params);
 
-  // Remaining initialization is for Windows shell integration, which doesn't
-  // apply to app windows in Ash.
-  if (IsRunningInAsh())
-    return;
-
   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();
   Profile* profile =
       Profile::FromBrowserContext(app_window()->browser_context());
@@ skipping 16 matching lines @@
   }
   return ChromeNativeAppWindowViewsAura::CreateStandardDesktopAppFrame();
 }
 
 bool ChromeNativeAppWindowViewsWin::CanMinimize() const {
   // Resizing on Windows breaks translucency if the window also has shape.
   // See http://crbug.com/417947.
   return ChromeNativeAppWindowViewsAura::CanMinimize() &&
          !(WidgetHasHitTestMask() && is_translucent_);
 }