Removal of ash related code from chrome_native_app_window_views_win

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

Index: chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc
diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc
index ce273c0a9fe33ef50a7c777cfe78cf7bef12695a..eebd1f2a1ddc5aa0c6e258c114703b3af01988c9 100644
--- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc
+++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc
@@ -5,7 +5,6 @@
 #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"
@@ -42,16 +41,6 @@ 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
@@ -90,10 +79,7 @@ void ChromeNativeAppWindowViewsWin::OnBeforeWidgetInit(
       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;
@@ -103,11 +89,6 @@ 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;