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 61 matching lines @@
   // Caption buttons.
   maximize_button_ = new ash::FrameMaximizeButton(this, this);
   maximize_button_->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_ACCNAME_MAXIMIZE));
   AddChildView(maximize_button_);
   close_button_ = new views::ImageButton(this);
   close_button_->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));
   AddChildView(close_button_);
 
+  // For Ash only, app windows do not show an icon. crbug.com/119411
+  bool show_icon = !browser_view()->browser()->is_app() &&
+      browser_view()->ShouldShowWindowIcon();
+
   // Initializing the TabIconView is expensive, so only do it if we need to.
-  if (browser_view()->ShouldShowWindowIcon()) {

[sky, 2012/03/22 16:58:12]

Wouldn't it be better to put this in ShouldShowWindowIcon so that if someone
else calls it they don't think the icon should be shown?

+  if (show_icon) {
     window_icon_ = new TabIconView(this);
     window_icon_->set_is_light(true);
     AddChildView(window_icon_);
     window_icon_->Update();
   }
 
   // Create incognito icon if necessary.
   UpdateAvatarInfo();
 
   // Frame painter handles layout of these buttons.
@@ skipping 80 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());
+  // For Ash only, app windows do not show title text. crbug.com/119411
+  if (!browser_view()->browser()->is_app() &&
+      browser_view()->ShouldShowWindowTitle())
+    frame_painter_->PaintTitleBar(this, canvas, BrowserFrame::GetTitleFont());
   if (browser_view()->IsToolbarVisible())
     PaintToolbarBackground(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())
@@ skipping 212 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);
 }