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

chrome/browser/ui/views/frame/opaque_browser_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 "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 30 matching lines @@
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font_list.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/views/controls/button/image_button.h"
 #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"
 
 #if defined(OS_LINUX)
 #include "ui/views/controls/menu/menu_runner.h"
 #endif
 
 using content::WebContents;
 
@@ skipping 369 matching lines @@
 
 bool OpaqueBrowserFrameView::ShouldShowWindowIcon() const {
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   // If using the system title bar, we do not want to show a second title bar
   // inside the client area.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseSystemTitleBar))
     return false;
 #endif
 
   views::WidgetDelegate* delegate = frame()->widget_delegate();
-  return platform_observer_->ShouldShowTitleBar() && delegate &&
+  return ShouldShowWindowTitleBar() && delegate &&
          delegate->ShouldShowWindowIcon();
 }
 
 bool OpaqueBrowserFrameView::ShouldShowWindowTitle() const {
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   // If using the system title bar, we do not want to show a second title bar
   // inside the client area.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseSystemTitleBar))
     return false;
 #endif
 
   // |delegate| may be NULL if called from callback of InputMethodChanged while
   // 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();
 }
 
 base::string16 OpaqueBrowserFrameView::GetWindowTitle() const {
   return frame()->widget_delegate()->GetWindowTitle();
 }
 
 int OpaqueBrowserFrameView::GetIconSize() const {
 #if defined(OS_WIN)
   // This metric scales up if either the titlebar height or the titlebar font
   // size are increased.
   return GetSystemMetrics(SM_CYSMICON);
 #else
   return std::max(BrowserFrame::GetTitleFont().GetHeight(), kIconMinimumSize);
 #endif
 }
 
 bool OpaqueBrowserFrameView::ShouldLeaveOffsetNearTopBorder() const {
   return frame()->ShouldLeaveOffsetNearTopBorder();
 }
 
 gfx::Size OpaqueBrowserFrameView::GetBrowserViewMinimumSize() const {
   return browser_view()->GetMinimumSize();
 }
 
 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 {
   return browser_view()->ShouldShowAvatar();
 }
 
 bool OpaqueBrowserFrameView::IsRegularOrGuestSession() const {
   return browser_view()->IsRegularOrGuestSession();
 }
 
@@ skipping 101 matching lines @@
 }
 
 int OpaqueBrowserFrameView::NonClientBorderThickness() const {
   return layout_->NonClientBorderThickness();
 }
 
 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());
   frame_background_->set_theme_overlay_image(GetFrameOverlayImage());
   frame_background_->set_top_area_height(GetTopAreaHeight());
 
   ui::ThemeProvider* tp = GetThemeProvider();
   frame_background_->SetSideImages(
       tp->GetImageSkiaNamed(IDR_WINDOW_LEFT_SIDE),
       tp->GetImageSkiaNamed(IDR_WINDOW_TOP_CENTER),
@@ skipping 293 matching lines @@
 
 int OpaqueBrowserFrameView::GetTopAreaHeight() const {
   gfx::ImageSkia* frame_image = GetFrameImage();
   int top_area_height = frame_image->height();
   if (browser_view()->IsTabStripVisible()) {
     top_area_height = std::max(top_area_height,
       GetBoundsForTabStrip(browser_view()->tabstrip()).bottom());
   }
   return top_area_height;
 }