Make packaged apps use AppNonClientFrameViewAsh when maximized

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

 // Copyright 2013 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/native_app_window_views.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h"
 #include "chrome/browser/ui/views/extensions/shell_window_frame_view.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "extensions/common/draggable_region.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 
 #if defined(OS_WIN)
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/web_applications/web_app_ui.h"
 #include "chrome/browser/web_applications/web_app_win.h"
 #include "ui/base/win/shell.h"
 #include "ui/views/win/hwnd_util.h"
 #endif
 
 #if defined(OS_LINUX)
 #include "chrome/browser/shell_integration_linux.h"
 #endif
 
 #if defined(USE_ASH)
+#include "ash/ash_switches.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/wm/custom_frame_view_ash.h"
 #include "ash/wm/panels/panel_frame_view.h"
 #include "ash/wm/window_state.h"
 #include "chrome/browser/ui/ash/ash_util.h"
+#include "chrome/browser/ui/views/frame/app_non_client_frame_view_ash.h"
+#include "chrome/browser/ui/views/frame/non_client_frame_view_switcher_ash.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
+#include "ui/views/widget/native_widget_aura.h"
 #endif
 
 using apps::ShellWindow;
 
 namespace {
 
 const int kMinPanelWidth = 100;
 const int kMinPanelHeight = 100;
 const int kDefaultPanelWidth = 200;
 const int kDefaultPanelHeight = 300;
@@ skipping 113 matching lines @@
   if (position_specified && !window_bounds.IsEmpty())
     init_params.bounds = window_bounds;
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   // Set up a custom WM_CLASS for app windows. This allows task switchers in
   // X11 environments to distinguish them from main browser windows.
   init_params.wm_class_name = web_app::GetWMClassFromAppName(app_name);
   init_params.wm_class_class = ShellIntegrationLinux::GetProgramClassName();
 #endif
 
+#if defined(USE_ASH)
+  if (!frameless_ &&
+      ash::switches::UseSameFrameForV1AndV2Apps() &&
+      chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH) {
+    // Initialize |frame_switcher_| to switch the non client frame view when
+    // |window_| is maximized. |frame_switcher_| must be initialized before
+    // |window_| is inited because it must be notified of changes in
+    // ash::wm::WindowShowState before WorkspaceLayoutManager. This
+    // notification order avoids an extra layout whenever |window_| is
+    // maximized.
+    views::NativeWidgetAura* native_widget =

[James Cook, 2013/10/02 21:07:55]

Why do you need to introduce a new native widget here?  Is this just creating
the native widget before window_->Init() does it below?  If so, that wasn't
clear to me.

[pkotwicz, 2013/10/03 20:45:35]

I have added a better comment.
The reason is that NonClientFrameViewSwitcherAsh must set a WindowObserver on
|native_widget| before BaseLayoutManager does so. (And yes, BaseLayoutManager
adds a WindowObserver on |native_widget| as part of window_->Init()) To avoid an
extra layout of the web contents, NonClientFrameViewSwitcherAsh must be notified
of a maximized state change before BaseLayoutManager/WorkspaceLayoutManager

I have not managed to pull up numbers as to how much an extra layout would cost.
(There is no 1-1 mapping between content::RenderWidgetHostImpl::WasResized() and
WebCore::FrameView::layout())

+        new views::NativeWidgetAura(window_);
+    frame_switcher_.reset(new NonClientFrameViewSwitcherAsh(
+        window_, native_widget->GetNativeView()));
+
+    init_params.native_widget = native_widget;
+    init_params.context = ash::Shell::GetPrimaryRootWindow();
+  }
+#endif
+
   window_->Init(init_params);
 
   gfx::Rect adjusted_bounds = window_bounds;
   adjusted_bounds.Inset(-GetFrameInsets());
   // Center window if no position was specified.
   if (!position_specified)
     window_->CenterWindow(adjusted_bounds.size());
   else if (!adjusted_bounds.IsEmpty() && adjusted_bounds != window_bounds)
     window_->SetBounds(adjusted_bounds);
 
@@ skipping 404 matching lines @@
 views::NonClientFrameView* NativeAppWindowViews::CreateNonClientFrameView(
     views::Widget* widget) {
 #if defined(USE_ASH)
   if (chrome::IsNativeViewInAsh(widget->GetNativeView())) {
     if (shell_window_->window_type_is_panel()) {
       ash::PanelFrameView::FrameType frame_type = frameless_ ?
           ash::PanelFrameView::FRAME_NONE : ash::PanelFrameView::FRAME_ASH;
       return new ash::PanelFrameView(widget, frame_type);
     }
     if (!frameless_) {
-      ash::CustomFrameViewAsh* frame = new ash::CustomFrameViewAsh();
-      frame->Init(widget);
-      return frame;
+      if (ash::switches::UseSameFrameForV1AndV2Apps() &&
+          IsMaximized()) {
+        return new AppNonClientFrameViewAsh(widget);
+      } else {
+        ash::CustomFrameViewAsh* frame = new ash::CustomFrameViewAsh();
+        frame->Init(widget);
+        return frame;
+      }
     }
   }
 #endif
   if (ShouldUseChromeStyleFrame()) {
     ShellWindowFrameView* frame_view = new ShellWindowFrameView(this);
     frame_view->Init(window_);
     return frame_view;
   }
   return views::WidgetDelegateView::CreateNonClientFrameView(widget);
 }
@@ skipping 160 matching lines @@
 
 void NativeAppWindowViews::HandleKeyboardEvent(
     const content::NativeWebKeyboardEvent& event) {
   unhandled_keyboard_event_handler_.HandleKeyboardEvent(event,
                                                         GetFocusManager());
 }
 
 void NativeAppWindowViews::RenderViewHostChanged() {
   OnViewWasResized();
 }