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

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

Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.cc
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.cc
index e139586aedff37845943f712d21d087bde990032..cadf1319a40f3b7790dd3988052f2280477fac2b 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.cc
@@ -79,8 +79,12 @@ void BrowserNonClientFrameViewAura::Init() {
       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_);
@@ -181,7 +185,10 @@ void BrowserNonClientFrameViewAura::OnPaint(gfx::Canvas* canvas) {
                               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);
 }