Makes mash use ChromeNativeAppWindowViewsAura

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

Index: chrome/browser/ui/views/apps/chrome_app_window_client_views_chromeos.cc
diff --git a/chrome/browser/ui/views/apps/chrome_app_window_client_views_chromeos.cc b/chrome/browser/ui/views/apps/chrome_app_window_client_views_chromeos.cc
index 289f916e3fb0d7e7e0dbce3ca758b7a23d8949f6..1832d08981b2c2e282edc9c269e3623f8471b07d 100644
--- a/chrome/browser/ui/views/apps/chrome_app_window_client_views_chromeos.cc
+++ b/chrome/browser/ui/views/apps/chrome_app_window_client_views_chromeos.cc
@@ -5,13 +5,18 @@
 #include "chrome/browser/ui/apps/chrome_app_window_client.h"
 
 #include "chrome/browser/ui/views/apps/chrome_native_app_window_views_aura_ash.h"
+#include "services/service_manager/runner/common/client_util.h"
 
 // static
 extensions::NativeAppWindow* ChromeAppWindowClient::CreateNativeAppWindowImpl(
     extensions::AppWindow* app_window,
     const extensions::AppWindow::CreateParams& params) {
-  ChromeNativeAppWindowViewsAuraAsh* window =
-      new ChromeNativeAppWindowViewsAuraAsh;
+  // TODO: Mash should use ChromeNativeAppWindowViewsAuraAsh, but
+  // it can't because of dependencies on ash. http://crbug.com/679028.
+  ChromeNativeAppWindowViewsAura* window =
+      service_manager::ServiceManagerIsRemote()
+          ? new ChromeNativeAppWindowViewsAura
+          : new ChromeNativeAppWindowViewsAuraAsh;
   window->Init(app_window, params);
   return window;
 }