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

apps/ui/views/shell_window_frame_view.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 "apps/ui/views/shell_window_frame_view.h"
 
 #include "apps/ui/native_app_window.h"
 #include "base/strings/utf_string_conversions.h"
 #include "extensions/common/draggable_region.h"
 #include "grit/theme_resources.h"
@@ skipping 42 matching lines @@
 
 void ShellWindowFrameView::Init(views::Widget* frame,
                                 int resize_inside_bounds_size,
                                 int resize_outside_bounds_size,
                                 int resize_outside_scale_for_touch,
                                 int resize_area_corner_size) {
   frame_ = frame;
   resize_inside_bounds_size_ = resize_inside_bounds_size;
   resize_area_corner_size_ = resize_area_corner_size;
 
-  if (!window_->IsFrameless()) {
+  if (ShouldShowWindowFrame()) {
     ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
     close_button_ = new views::ImageButton(this);
     close_button_->SetImage(views::CustomButton::STATE_NORMAL,
         rb.GetNativeImageNamed(IDR_APP_WINDOW_CLOSE).ToImageSkia());
     close_button_->SetImage(views::CustomButton::STATE_HOVERED,
         rb.GetNativeImageNamed(IDR_APP_WINDOW_CLOSE_H).ToImageSkia());
     close_button_->SetImage(views::CustomButton::STATE_PRESSED,
         rb.GetNativeImageNamed(IDR_APP_WINDOW_CLOSE_P).ToImageSkia());
     close_button_->SetAccessibleName(
         l10n_util::GetStringUTF16(IDS_APP_ACCNAME_CLOSE));
@@ skipping 46 matching lines @@
     window->SetHitTestBoundsOverrideOuter(mouse_insets, touch_insets);
   }
   // Ensure we get resize cursors just inside our bounds as well.
   // TODO(jeremya): do we need to update these when in fullscreen/maximized?
   window->set_hit_test_bounds_override_inner(
       gfx::Insets(resize_inside_bounds_size_, resize_inside_bounds_size_,
                   resize_inside_bounds_size_, resize_inside_bounds_size_));
 #endif
 }
 
+bool ShellWindowFrameView::ShouldShowWindowFrame() const {
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+  // Linux does not use the custom window frame. The operating system's native
+  // window frame will be applied when window_->IsFrameless() is false.
+  return false;
+#endif
+
+  return !window_->IsFrameless();
+}
+
 // views::NonClientFrameView implementation.
 
 gfx::Rect ShellWindowFrameView::GetBoundsForClientView() const {
-  if (window_->IsFrameless() || frame_->IsFullscreen())
+  if (!ShouldShowWindowFrame() || frame_->IsFullscreen())
     return bounds();
   return gfx::Rect(0, kCaptionHeight, width(),
       std::max(0, height() - kCaptionHeight));
 }
 
 gfx::Rect ShellWindowFrameView::GetWindowBoundsForClientBounds(
       const gfx::Rect& client_bounds) const {
-  if (window_->IsFrameless()) {
+  if (!ShouldShowWindowFrame()) {
     gfx::Rect window_bounds = client_bounds;
     // Enforce minimum size (1, 1) in case that client_bounds is passed with
     // empty size. This could occur when the frameless window is being
     // initialized.
     if (window_bounds.IsEmpty()) {
       window_bounds.set_width(1);
       window_bounds.set_height(1);
     }
     return window_bounds;
   }
@@ skipping 39 matching lines @@
                                                resize_border,
                                                resize_border,
                                                resize_area_corner_size_,
                                                resize_area_corner_size_,
                                                can_ever_resize);
   if (frame_component != HTNOWHERE)
     return frame_component;
 
   // Check for possible draggable region in the client area for the frameless
   // window.
-  if (window_->IsFrameless()) {
+  if (!ShouldShowWindowFrame()) {
     SkRegion* draggable_region = window_->GetDraggableRegion();
     if (draggable_region && draggable_region->contains(point.x(), point.y()))
       return HTCAPTION;
   }
 
   int client_component = frame_->client_view()->NonClientHitTest(point);
   if (client_component != HTNOWHERE)
     return client_component;
 
   // Then see if the point is within any of the window controls.
@@ skipping 24 matching lines @@
 // views::View implementation.
 
 gfx::Size ShellWindowFrameView::GetPreferredSize() {
   gfx::Size pref = frame_->client_view()->GetPreferredSize();
   gfx::Rect bounds(0, 0, pref.width(), pref.height());
   return frame_->non_client_view()->GetWindowBoundsForClientBounds(
       bounds).size();
 }
 
 void ShellWindowFrameView::Layout() {
-  if (window_->IsFrameless())
+  if (!ShouldShowWindowFrame())
     return;
   gfx::Size close_size = close_button_->GetPreferredSize();
   const int kButtonOffsetY = 0;
   const int kButtonSpacing = 1;
   const int kRightMargin = 3;
 
   close_button_->SetBounds(
       width() - kRightMargin - close_size.width(),
       kButtonOffsetY,
       close_size.width(),
@@ skipping 26 matching lines @@
 
   gfx::Size minimize_size = minimize_button_->GetPreferredSize();
   minimize_button_->SetBounds(
       maximize_button_->x() - kButtonSpacing - minimize_size.width(),
       kButtonOffsetY,
       minimize_size.width(),
       minimize_size.height());
 }
 
 void ShellWindowFrameView::OnPaint(gfx::Canvas* canvas) {
-  if (window_->IsFrameless())
+  if (!ShouldShowWindowFrame())
     return;
 
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   if (ShouldPaintAsActive()) {
     close_button_->SetImage(views::CustomButton::STATE_NORMAL,
         rb.GetNativeImageNamed(IDR_APP_WINDOW_CLOSE).ToImageSkia());
   } else {
     close_button_->SetImage(views::CustomButton::STATE_NORMAL,
         rb.GetNativeImageNamed(IDR_APP_WINDOW_CLOSE_U).ToImageSkia());
   }
@@ skipping 14 matching lines @@
   path.close();
   canvas->DrawPath(path, paint);
 }
 
 const char* ShellWindowFrameView::GetClassName() const {
   return kViewClassName;
 }
 
 gfx::Size ShellWindowFrameView::GetMinimumSize() {
   gfx::Size min_size = frame_->client_view()->GetMinimumSize();
-  if (window_->IsFrameless())
+  if (!ShouldShowWindowFrame())
     return min_size;
 
   // Ensure we can display the top of the caption area.
   gfx::Rect client_bounds = GetBoundsForClientView();
   min_size.Enlarge(0, client_bounds.y());
   // Ensure we have enough space for the window icon and buttons.  We allow
   // the title string to collapse to zero width.
   int closeButtonOffsetX =
       (kCaptionHeight - close_button_->height()) / 2;
   int header_width = close_button_->width() + closeButtonOffsetX * 2;
@@ skipping 12 matching lines @@
   if (max_size.height())
     max_size.Enlarge(0, height() - client_size.height());
 
   return max_size;
 }
 
 // views::ButtonListener implementation.
 
 void ShellWindowFrameView::ButtonPressed(views::Button* sender,
                                          const ui::Event& event) {
-  DCHECK(!window_->IsFrameless());
+  DCHECK(ShouldShowWindowFrame());
   if (sender == close_button_)
     frame_->Close();
   else if (sender == maximize_button_)
     frame_->Maximize();
   else if (sender == restore_button_)
     frame_->Restore();
   else if (sender == minimize_button_)
     frame_->Minimize();
 }
 
 }  // namespace apps