Don't set app window WS_CAPTION style when running in ash mode.

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/app_window.h"
 #include "apps/app_window_registry.h"
 #include "apps/ui/views/app_window_frame_view.h"
 #include "ash/shell.h"
@@ skipping 22 matching lines @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/win/shell.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/win/hwnd_util.h"
 
 ChromeNativeAppWindowViewsWin::ChromeNativeAppWindowViewsWin()
     : weak_ptr_factory_(this), glass_frame_view_(NULL) {
 }
 
 void ChromeNativeAppWindowViewsWin::ActivateParentDesktopIfNecessary() {
-  if (!ash::Shell::HasInstance())
-    return;
-
-  views::Widget* widget =
-      implicit_cast<views::WidgetDelegate*>(this)->GetWidget();
-  chrome::HostDesktopType host_desktop_type =
-      chrome::GetHostDesktopTypeForNativeWindow(widget->GetNativeWindow());
-  // Only switching into Ash from Native is supported. Tearing the user out of
-  // Metro mode can only be done by launching a process from Metro mode itself.
-  // This is done for launching apps, but not regular activations.

[calamity, 2014/06/19 07:43:06]

nit: Any reason for removing this condition's comment?

[benwells, 2014/06/19 08:33:37]

No good reason :) Added the comment back.

-  if (host_desktop_type == chrome::HOST_DESKTOP_TYPE_ASH &&
+  if (IsRunningInAsh() &&
       chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_NATIVE) {
     chrome::ActivateMetroChrome();
   }
 }
 
 HWND ChromeNativeAppWindowViewsWin::GetNativeAppWindowHWND() const {
   return views::HWNDForWidget(widget()->GetTopLevelWidget());
 }
 
+bool ChromeNativeAppWindowViewsWin::IsRunningInAsh() {
+  if (!ash::Shell::HasInstance())
+    return false;
+
+  views::Widget* widget =
+      implicit_cast<views::WidgetDelegate*>(this)->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 41 matching lines @@
   HWND hwnd = GetNativeAppWindowHWND();
   Profile* profile =
       Profile::FromBrowserContext(app_window()->browser_context());
   app_model_id_ =
       ShellIntegration::GetAppModelIdForProfile(app_name_wide,
                                                 profile->GetPath());
   ui::win::SetAppIdForWindow(app_model_id_, hwnd);
 
   web_app::UpdateRelaunchDetailsForApp(profile, extension, hwnd);
 
-  if (!create_params.transparent_background)
+  if (!create_params.transparent_background && !IsRunningInAsh())
     EnsureCaptionStyleSet();
   UpdateShelfMenu();
 }
 
 views::NonClientFrameView*
 ChromeNativeAppWindowViewsWin::CreateStandardDesktopAppFrame() {
   glass_frame_view_ = NULL;
   if (ui::win::IsAeroGlassEnabled()) {
     glass_frame_view_ = new GlassAppWindowFrameViewWin(this, widget());
     return glass_frame_view_;
@@ skipping 48 matching lines @@
                                               extension->id());
 
     ShellLinkItemList items;
     items.push_back(link);
     jumplist_updater.AddTasks(items);
   }
 
   // Note that an empty jumplist must still be committed to clear all items.
   jumplist_updater.CommitUpdate();
 }