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

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

Index: chrome/browser/ui/views/frame/opaque_browser_frame_view_linux.cc
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view_linux.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view_linux.cc
index 9d7995c3101888ae95ce3277ee5619efddc05529..78399e57eafcbf71ce9e842072f672b8f3c4ff6f 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view_linux.cc
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view_linux.cc
@@ -4,8 +4,10 @@
 
 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_linux.h"
 
+#include "base/command_line.h"
 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.h"
+#include "chrome/common/chrome_switches.h"
 #include "ui/views/linux_ui/linux_ui.h"
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -32,6 +34,10 @@ OpaqueBrowserFrameViewLinux::~OpaqueBrowserFrameViewLinux() {
 //     OpaqueBrowserFrameViewPlatformSpecific implementation:
 
 bool OpaqueBrowserFrameViewLinux::ShouldShowCaptionButtons() const {
+  // Do not show caption buttons if the system title bar is being used.
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseSystemTitleBar))
+    return false;
+
   // On Ubuntu Unity, if the window is maximized, the system will provide
   // caption buttons, so Chrome should not add its own.
   views::LinuxUI* ui = views::LinuxUI::instance();