Allow Chrome apps to create Ash Panels (apps v2)

chrome/browser/ui/views/extensions/shell_window_views.cc

Index: chrome/browser/ui/views/extensions/shell_window_views.cc
diff --git a/chrome/browser/ui/views/extensions/shell_window_views.cc b/chrome/browser/ui/views/extensions/shell_window_views.cc
index 677359bffd5f0c4f9b48729e6ada8f56afd6d062..13c1ab90e15ec2c2551deef9857de3f86c16ebe7 100644
--- a/chrome/browser/ui/views/extensions/shell_window_views.cc
+++ b/chrome/browser/ui/views/extensions/shell_window_views.cc
@@ -41,6 +41,7 @@
 #include "ash/ash_constants.h"
 #include "ash/wm/custom_frame_view_ash.h"
 #include "chrome/browser/ui/ash/ash_util.h"
+#include "chrome/browser/ui/ash/shell_utility_window_ash.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #endif
@@ -400,7 +401,7 @@ ShellWindowViews::ShellWindowViews(ShellWindow* shell_window,
     : shell_window_(shell_window),
       web_view_(NULL),
       is_fullscreen_(false),
-      frameless_(win_params.frame == ShellWindow::CreateParams::FRAME_NONE) {
+      frameless_(win_params.frame == ShellWindow::FRAME_NONE) {
   window_ = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
   params.delegate = this;
@@ -739,5 +740,9 @@ void ShellWindowViews::SaveWindowPlacement(const gfx::Rect& bounds,
 // static
 NativeShellWindow* NativeShellWindow::Create(
     ShellWindow* shell_window, const ShellWindow::CreateParams& params) {
+#if defined(USE_ASH)
+  if (params.window_type == ShellWindow::WINDOW_TYPE_PANEL)
+    return new ShellUtilityWindowAsh(shell_window, params);
+#endif
   return new ShellWindowViews(shell_window, params);
 }