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

chrome/browser/ui/views/apps/native_app_window_views.cc

 // Copyright 2013 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/apps/native_app_window_views.h"
 
 #include "apps/shell_window.h"
 #include "apps/ui/views/shell_window_frame_view.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 238 matching lines @@
     views::Widget* widget) {}
 
 void NativeAppWindowViews::InitializeDefaultWindow(
     const ShellWindow::CreateParams& create_params) {
   std::string app_name =
       web_app::GenerateApplicationNameFromExtensionId(extension()->id());
 
   views::Widget::InitParams init_params(views::Widget::InitParams::TYPE_WINDOW);
   init_params.delegate = this;
   init_params.remove_standard_frame = ShouldUseChromeStyleFrame();
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+  // If not using system title bars on Linux, remove the standard frame.
+  // Instead, we will use CustomFrameView to draw a native-like frame.
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kUseSystemTitleBar)) {
+    init_params.remove_standard_frame = true;
+  }
+#endif
   init_params.use_system_default_icon = true;
   // TODO(erg): Conceptually, these are toplevel windows, but we theoretically
   // could plumb context through to here in some cases.
   init_params.top_level = true;
   if (create_params.transparent_background)
     init_params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   init_params.keep_on_top = create_params.always_on_top;
   gfx::Rect window_bounds = create_params.bounds;
   bool position_specified =
       window_bounds.x() != INT_MIN && window_bounds.y() != INT_MIN;
@@ skipping 518 matching lines @@
             new ash::ImmersiveFullscreenController());
         custom_frame_view->InitImmersiveFullscreenControllerForView(
             immersive_fullscreen_controller_.get());
       }
 #endif
       custom_frame_view->GetHeaderView()->set_context_menu_controller(this);
       return custom_frame_view;
     }
   }
 #endif
+
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+  // If using the system title bar, we need a ShellWindowFrameView instead of a
+  // CustomFrameView. The ShellWindowFrameView will not draw its own frame.
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUseSystemTitleBar))
+    return CreateShellWindowFrameView();
+#endif
+
   if (ShouldUseChromeStyleFrame())
     return CreateShellWindowFrameView();
   return views::WidgetDelegateView::CreateNonClientFrameView(widget);
 }
 
 bool NativeAppWindowViews::WidgetHasHitTestMask() const {
   return shape_ != NULL;
 }
 
 void NativeAppWindowViews::GetWidgetHitTestMask(gfx::Path* mask) const {
@@ skipping 206 matching lines @@
   gfx::Rect client_bounds = gfx::Rect(1000, 1000);
   gfx::Rect window_bounds =
       window_->non_client_view()->GetWindowBoundsForClientBounds(
           client_bounds);
   return window_bounds.InsetsFrom(client_bounds);
 }
 
 void NativeAppWindowViews::HideWithApp() {}
 void NativeAppWindowViews::ShowWithApp() {}
 void NativeAppWindowViews::UpdateWindowMinMaxSize() {}