Ash: Don't show window icon or title for app windows

chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.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/browser_non_client_frame_view_aura.h"
 
 #include "ash/wm/frame_painter.h"
 #include "ash/wm/workspace/frame_maximize_button.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/views/avatar_menu_button.h"
@@ skipping 163 matching lines @@
 
 void BrowserNonClientFrameViewAura::OnPaint(gfx::Canvas* canvas) {
   if (frame()->IsFullscreen())
     return;  // Nothing visible, don't paint.
   // The primary header image changes based on window activation state and
   // theme, so we look it up for each paint.
   frame_painter_->PaintHeader(this,
                               canvas,
                               GetThemeFrameBitmap(),
                               GetThemeFrameOverlayBitmap());
-  frame_painter_->PaintTitleBar(this, canvas, BrowserFrame::GetTitleFont());
+  if (browser_view()->ShouldShowWindowTitle())
+    frame_painter_->PaintTitleBar(this, canvas, BrowserFrame::GetTitleFont());
   if (browser_view()->IsToolbarVisible())
     PaintToolbarBackground(canvas);
+  else
+    PaintContentEdge(canvas);
 }
 
 void BrowserNonClientFrameViewAura::Layout() {
   // Maximized windows and app/popup windows use shorter buttons.
   bool maximized_layout =
       frame()->IsMaximized() || !browser_view()->IsBrowserTypeNormal();
   frame_painter_->LayoutHeader(this, maximized_layout);
   if (avatar_button())
     LayoutAvatar();
   BrowserNonClientFrameView::Layout();
@@ skipping 70 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserNonClientFrameViewAura, private:
 
 
 int BrowserNonClientFrameViewAura::NonClientTopBorderHeight(
     bool force_restored) const {
   if (force_restored)
     return kTabstripTopSpacingRestored;
   if (frame()->IsFullscreen())
     return 0;
-  if (frame()->IsMaximized())
-    return kTabstripTopSpacingMaximized;
-  if (frame()->widget_delegate() &&
-      frame()->widget_delegate()->ShouldShowWindowTitle()) {
-    // For popups ensure we have enough space to see the full window buttons.
-    return close_button_->bounds().bottom();
+  // Windows with tab strips need a smaller non-client area.
+  if (browser_view()->IsTabStripVisible()) {
+    if (frame()->IsMaximized())
+      return kTabstripTopSpacingMaximized;
+    return kTabstripTopSpacingRestored;
   }
-  return kTabstripTopSpacingRestored;
+  // For windows without a tab strip (popups, etc.) ensure we have enough space
+  // to see the window caption buttons and the content separator line.
+  return close_button_->bounds().bottom() + kClientEdgeThickness;
 }
 
 void BrowserNonClientFrameViewAura::LayoutAvatar() {
   DCHECK(avatar_button());
   SkBitmap incognito_icon = browser_view()->GetOTRAvatarIcon();
 
   int avatar_bottom = GetHorizontalTabStripVerticalOffset(false) +
       browser_view()->GetTabStripHeight() - kAvatarBottomSpacing;
   int avatar_restored_y = avatar_bottom - incognito_icon.height();
   int avatar_y = frame()->IsMaximized() ?
@@ skipping 56 matching lines @@
                        w, split_point + kContentShadowHeight + 1);
 
   // Draw the content/toolbar separator.
   canvas->FillRect(gfx::Rect(x + kClientEdgeThickness,
                              toolbar_bounds.bottom() - kClientEdgeThickness,
                              w - (2 * kClientEdgeThickness),
                              kClientEdgeThickness),
       ThemeService::GetDefaultColor(ThemeService::COLOR_TOOLBAR_SEPARATOR));
 }
 
+void BrowserNonClientFrameViewAura::PaintContentEdge(gfx::Canvas* canvas) {
+  canvas->FillRect(gfx::Rect(0, close_button_->bounds().bottom(),
+                             width(), kClientEdgeThickness),
+      ThemeService::GetDefaultColor(ThemeService::COLOR_TOOLBAR_SEPARATOR));
+}
+
 const SkBitmap* BrowserNonClientFrameViewAura::GetThemeFrameBitmap() const {
   bool is_incognito = browser_view()->IsOffTheRecord();
   int resource_id;
   if (browser_view()->IsBrowserTypeNormal()) {
     if (ShouldPaintAsActive()) {
       // Use the standard resource ids to allow users to theme the frames.
       // TODO(jamescook): If this becomes the only frame we use on Aura, define
       // the resources to use the standard ids like IDR_THEME_FRAME, etc.
       if (is_incognito) {
         return GetCustomBitmap(IDR_THEME_FRAME_INCOGNITO,
@@ skipping 36 matching lines @@
 }
 
 SkBitmap* BrowserNonClientFrameViewAura::GetCustomBitmap(
     int bitmap_id,
     int fallback_bitmap_id) const {
   ui::ThemeProvider* tp = GetThemeProvider();
   if (tp->HasCustomImage(bitmap_id))
     return tp->GetBitmapNamed(bitmap_id);
   return tp->GetBitmapNamed(fallback_bitmap_id);
 }