Linux Aura: Added --use-system-title-bar flag.

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 f370c85a8039cadb8d6536f4986bf91686247f51..2b4f74a59bc40291c9fb1d7b59dcc8a7ce64af49 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -7,6 +7,7 @@
 #include <algorithm>
 #include <string>
 
+#include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
@@ -23,6 +24,7 @@
 #include "chrome/browser/ui/views/tab_icon_view.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/profile_management_switches.h"
 #include "content/public/browser/notification_service.h"
@@ -224,7 +226,7 @@ int OpaqueBrowserFrameView::NonClientHitTest(const gfx::Point& point) {
   gfx::Rect sysmenu_rect(IconBounds());
   // In maximized mode we extend the rect to the screen corner to take advantage
   // of Fitts' Law.
-  if (frame()->IsMaximized())
+  if (layout_->IsTitleBarCondensed())
     sysmenu_rect.SetRect(0, 0, sysmenu_rect.right(), sysmenu_rect.bottom());
   sysmenu_rect.set_x(GetMirroredXForRect(sysmenu_rect));
   if (sysmenu_rect.Contains(point))
@@ -263,7 +265,7 @@ void OpaqueBrowserFrameView::GetWindowMask(const gfx::Size& size,
                                            gfx::Path* window_mask) {
   DCHECK(window_mask);
 
-  if (frame()->IsMaximized() || frame()->IsFullscreen())
+  if (layout_->IsTitleBarCondensed() || frame()->IsFullscreen())
     return;
 
   views::GetDefaultWindowMask(size, window_mask);
@@ -427,12 +429,26 @@ void OpaqueBrowserFrameView::Observe(
 // OpaqueBrowserFrameView, OpaqueBrowserFrameViewLayoutDelegate implementation:
 
 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 &&
          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
@@ -522,7 +538,7 @@ void OpaqueBrowserFrameView::OnPaint(gfx::Canvas* canvas) {
   if (frame()->IsFullscreen())
     return;  // Nothing is visible, so don't bother to paint.
 
-  if (frame()->IsMaximized())
+  if (layout_->IsTitleBarCondensed())
     PaintMaximizedFrameBorder(canvas);
   else
     PaintRestoredFrameBorder(canvas);
@@ -537,7 +553,7 @@ void OpaqueBrowserFrameView::OnPaint(gfx::Canvas* canvas) {
 
   if (browser_view()->IsToolbarVisible())
     PaintToolbarBackground(canvas);
-  if (!frame()->IsMaximized())
+  if (!layout_->IsTitleBarCondensed())
     PaintRestoredClientEdge(canvas);
 }