Linux Aura: Hide title bar when CustomFrameView maximized on Unity.

ui/views/window/custom_frame_view.cc

 // Copyright (c) 2012 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 "ui/views/window/custom_frame_view.h"
 
 #include <algorithm>
 
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ui_resources.h"
@@ skipping 13 matching lines @@
 #include "ui/views/window/frame_background.h"
 #include "ui/views/window/window_resources.h"
 #include "ui/views/window/window_shape.h"
 
 #if defined(USE_AURA)
 #include "ui/views/widget/native_widget_aura.h"
 #elif defined(OS_WIN)
 #include "ui/views/widget/native_widget_win.h"
 #endif
 
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#include "ui/views/linux_ui/linux_ui.h"

[Ben Goodger (Google), 2014/01/09 23:03:27]

Hrm... I would actually like to not have this type of #include seep into views.
I understand linux_ui is already in views, but linux_ui pulls in other stuff
that views by and large does not depend on, e.g. shell dialogs, and your code in
this file mentions things I'd rather keep out of the views layer (e.g. mentions
of unity etc).

Is there a way to inject this dependency instead?

[Matt Giuca, 2014/01/10 01:07:50]

Is the style used by OpaqueBrowserFrameView (having a specific
OpaqueBrowserFrameViewPlatformSpecific class that is overridden by
OpaqueBrowserFrameViewLinux) appropriate here?

It's a little over-engineered for my liking, but it would get the Linux (and
Unity)-specific stuff out of this generic class.

Just wanted to check that this is what you mean before I go implementing it.

+#endif
+
 namespace views {
 
 namespace {
 
 // The frame border is only visible in restored mode and is hardcoded to 4 px on
 // each side regardless of the system window border size.
 const int kFrameBorderThickness = 4;
 // In the window corners, the resize areas don't actually expand bigger, but the
 // 16 px at the end of each edge triggers diagonal resizing.
 const int kResizeAreaCornerSize = 16;
@@ skipping 135 matching lines @@
   int window_component = GetHTComponentForFrame(point, FrameBorderThickness(),
       NonClientBorderThickness(), kResizeAreaCornerSize, kResizeAreaCornerSize,
       frame_->widget_delegate()->CanResize());
   // Fall back to the caption if no other component matches.
   return (window_component == HTNOWHERE) ? HTCAPTION : window_component;
 }
 
 void CustomFrameView::GetWindowMask(const gfx::Size& size,
                                     gfx::Path* window_mask) {
   DCHECK(window_mask);
-  if (frame_->IsMaximized())
+  if (frame_->IsMaximized() || !ShouldShowTitleBarAndBorder())
     return;
 
   GetDefaultWindowMask(size, window_mask);
 }
 
 void CustomFrameView::ResetWindowControls() {
   restore_button_->SetState(CustomButton::STATE_NORMAL);
   minimize_button_->SetState(CustomButton::STATE_NORMAL);
   maximize_button_->SetState(CustomButton::STATE_NORMAL);
   // The close button isn't affected by this constraint.
 }
 
 void CustomFrameView::UpdateWindowIcon() {
   if (window_icon_)
     window_icon_->SchedulePaint();
 }
 
 void CustomFrameView::UpdateWindowTitle() {
   SchedulePaintInRect(title_bounds_);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CustomFrameView, View overrides:
 
 void CustomFrameView::OnPaint(gfx::Canvas* canvas) {
+  if (!ShouldShowTitleBarAndBorder())
+    return;
+
   if (frame_->IsMaximized())
     PaintMaximizedFrameBorder(canvas);
   else
     PaintRestoredFrameBorder(canvas);
   PaintTitleBar(canvas);
   if (ShouldShowClientEdge())
     PaintRestoredClientEdge(canvas);
 }
 
 void CustomFrameView::Layout() {
-  LayoutWindowControls();
-  LayoutTitleBar();
+  if (ShouldShowTitleBarAndBorder()) {
+    LayoutWindowControls();
+    LayoutTitleBar();
+  }
+
   LayoutClientView();
 }
 
 gfx::Size CustomFrameView::GetPreferredSize() {
   return frame_->non_client_view()->GetWindowBoundsForClientBounds(
       gfx::Rect(frame_->client_view()->GetPreferredSize())).size();
 }
 
 gfx::Size CustomFrameView::GetMinimumSize() {
   return frame_->non_client_view()->GetWindowBoundsForClientBounds(
@@ skipping 79 matching lines @@
   // When the icon is shorter than the minimum space we reserve for the caption
   // button, we vertically center it.  We want to bias rounding to put extra
   // space above the icon, since the 3D edge (+ client edge, for restored
   // windows) below looks (to the eye) more like additional space than does the
   // 3D edge (or nothing at all, for maximized windows) above; hence the +1.
   int y = unavailable_px_at_top + (NonClientTopBorderHeight() -
       unavailable_px_at_top - size - TitlebarBottomThickness() + 1) / 2;
   return gfx::Rect(frame_thickness + kIconLeftSpacing, y, size, size);
 }
 
+bool CustomFrameView::ShouldShowTitleBarAndBorder() const {
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+  // On Ubuntu Unity, if the window is maximized, the system will provide a
+  // title and caption buttons, so we should not add our own.

[Ben Goodger (Google), 2014/01/10 16:41:50]

is this true of all frame types within views? if so, then a ViewsDelegate method
might be in order.

[Matt Giuca, 2014/01/17 01:29:51]

OK, I have added a ViewsDelegate method for this. Two things that I wasn't sure
about:
- I've still got the Unity-specific check in, but it's in
chrome/browser/ui/views now, instead of ui/views. Does that satisfy your above
concern about not wanting this sort of code to creep into Views?
- I've noticed that ViewsDelegate is used in very few places in the code. I'm
not sure if it's appropriate to add random methods in there (it seems like it's
reserved for low-level Views things, not specific needs of particular Views
clients).

To answer your first question, I've updated OpaqueBrowserFrameViews to use this
new scheme, and it's a lot shorter, so yes, this is useful in more than one
location.

+  views::LinuxUI* ui = views::LinuxUI::instance();
+  return !(frame_->IsMaximized() && ui && ui->UnityIsRunning());
+#endif
+
+  return true;
+}
+
 bool CustomFrameView::ShouldShowClientEdge() const {
-  return !frame_->IsMaximized();
+  return !frame_->IsMaximized() && ShouldShowTitleBarAndBorder();
 }
 
 void CustomFrameView::PaintRestoredFrameBorder(gfx::Canvas* canvas) {
   frame_background_->set_frame_color(GetFrameColor());
   const gfx::ImageSkia* frame_image = GetFrameImage();
   frame_background_->set_theme_image(frame_image);
   frame_background_->set_top_area_height(frame_image->height());
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
 
@@ skipping 204 matching lines @@
   // midline rather than below.  This compensates for how the icon is already
   // biased downwards (see IconBounds()) and helps prevent descenders on the
   // title from overlapping the 3D edge at the bottom of the titlebar.
   title_bounds_.SetRect(title_x,
       icon_bounds.y() + ((icon_bounds.height() - title_height - 1) / 2),
       std::max(0, minimize_button_->x() - kTitleCaptionSpacing -
       title_x), title_height);
 }
 
 void CustomFrameView::LayoutClientView() {
+  if (!ShouldShowTitleBarAndBorder()) {
+    client_view_bounds_ = bounds();
+    return;
+  }
+
   int top_height = NonClientTopBorderHeight();
   int border_thickness = NonClientBorderThickness();
   client_view_bounds_.SetRect(border_thickness, top_height,
       std::max(0, width() - (2 * border_thickness)),
       std::max(0, height() - top_height - border_thickness));
 }
 
 ImageButton* CustomFrameView::InitWindowCaptionButton(
     int accessibility_string_id,
     int normal_image_id,
     int hot_image_id,
     int pushed_image_id) {
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   ImageButton* button = new ImageButton(this);
   button->SetAccessibleName(l10n_util::GetStringUTF16(accessibility_string_id));
   button->SetImage(CustomButton::STATE_NORMAL,
                    rb.GetImageNamed(normal_image_id).ToImageSkia());
   button->SetImage(CustomButton::STATE_HOVERED,
                    rb.GetImageNamed(hot_image_id).ToImageSkia());
   button->SetImage(CustomButton::STATE_PRESSED,
                    rb.GetImageNamed(pushed_image_id).ToImageSkia());
   AddChildView(button);
   return button;
 }
 
 }  // namespace views