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

chrome/browser/ui/views/frame/opaque_browser_frame_view.cc

Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
index 2b4f74a59bc40291c9fb1d7b59dcc8a7ce64af49..1df6e5075538c9afd233fb5dfd8f5fce3bb144d4 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -48,6 +48,7 @@
 #include "ui/views/controls/image_view.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/layout_constants.h"
+#include "ui/views/views_delegate.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/window/frame_background.h"
 #include "ui/views/window/window_shape.h"
@@ -437,7 +438,7 @@ bool OpaqueBrowserFrameView::ShouldShowWindowIcon() const {
 #endif
 
   views::WidgetDelegate* delegate = frame()->widget_delegate();
-  return platform_observer_->ShouldShowTitleBar() && delegate &&
+  return ShouldShowWindowTitleBar() && delegate &&
          delegate->ShouldShowWindowIcon();
 }
 
@@ -453,7 +454,7 @@ bool OpaqueBrowserFrameView::ShouldShowWindowTitle() const {
   // a window is being destroyed.
   // See more discussion at http://crosbug.com/8958
   views::WidgetDelegate* delegate = frame()->widget_delegate();
-  return platform_observer_->ShouldShowTitleBar() && delegate &&
+  return ShouldShowWindowTitleBar() && delegate &&
          delegate->ShouldShowWindowTitle();
 }
 
@@ -480,9 +481,15 @@ gfx::Size OpaqueBrowserFrameView::GetBrowserViewMinimumSize() const {
 }
 
 bool OpaqueBrowserFrameView::ShouldShowCaptionButtons() const {
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+  // Do not show caption buttons if the system title bar is being used.
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseSystemTitleBar))
+    return false;
+#endif
+
   if (!OpaqueBrowserFrameViewLayout::ShouldAddDefaultCaptionButtons())
     return false;
-  return platform_observer_->ShouldShowCaptionButtons();
+  return ShouldShowWindowTitleBar();
 }
 
 bool OpaqueBrowserFrameView::ShouldShowAvatar() const {
@@ -604,6 +611,13 @@ gfx::Rect OpaqueBrowserFrameView::IconBounds() const {
   return layout_->IconBounds();
 }
 
+bool OpaqueBrowserFrameView::ShouldShowWindowTitleBar() const {
+  if (!views::ViewsDelegate::views_delegate)
+    return true;
+  return !views::ViewsDelegate::views_delegate->WindowManagerProvidesTitleBar(
+              IsMaximized());
+}
+
 void OpaqueBrowserFrameView::PaintRestoredFrameBorder(gfx::Canvas* canvas) {
   frame_background_->set_frame_color(GetFrameColor());
   frame_background_->set_theme_image(GetFrameImage());