Make title text white in ash incognito popup window frames.

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

 // Copyright 2014 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_header_painter_ash.h"
 
 #include "ash/common/ash_layout_constants.h"
 #include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/common/frame/header_painter_util.h"
 #include "ash/resources/grit/ash_resources.h"
 #include "base/logging.h"  // DCHECK
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/grit/theme_resources.h"
 #include "third_party/skia/include/core/SkCanvas.h"
+#include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
 #include "ui/gfx/animation/slide_animation.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/vector_icons_public.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 using views::Widget;
 
 namespace {
+
 // Color for the window title text.
-const SkColor kWindowTitleTextColor = SkColorSetRGB(40, 40, 40);
+const SkColor kNormalWindowTitleTextColor = SkColorSetRGB(40, 40, 40);
+const SkColor kIncognitoWindowTitleTextColor = SK_ColorWHITE;
+
 // Duration of crossfade animation for activating and deactivating frame.
 const int kActivationCrossfadeDurationMs = 200;
 
 // Creates a path with rounded top corners.
 SkPath MakeRoundRectPath(const gfx::Rect& bounds,
                          int top_left_corner_radius,
                          int top_right_corner_radius) {
   SkRect rect = gfx::RectToSkRect(bounds);
   const SkScalar kTopLeftRadius = SkIntToScalar(top_left_corner_radius);
   const SkScalar kTopRightRadius = SkIntToScalar(top_right_corner_radius);
@@ skipping 277 matching lines @@
                        right_edge.width(),
                        painted_height_ - top_right_height);
 }
 
 void BrowserHeaderPainterAsh::PaintTitleBar(gfx::Canvas* canvas) {
   // The window icon is painted by its own views::View.
   gfx::Rect title_bounds = GetTitleBounds();
   title_bounds.set_x(view_->GetMirroredXForRect(title_bounds));
   canvas->DrawStringRectWithFlags(frame_->widget_delegate()->GetWindowTitle(),
                                   BrowserFrame::GetTitleFontList(),
-                                  kWindowTitleTextColor,
+                                  is_incognito_ ? kIncognitoWindowTitleTextColor
+                                                : kNormalWindowTitleTextColor,
                                   title_bounds,
                                   gfx::Canvas::NO_SUBPIXEL_RENDERING);
 }
 
 void BrowserHeaderPainterAsh::UpdateCaptionButtons() {
   caption_button_container_->SetButtonImage(
       ash::CAPTION_BUTTON_ICON_MINIMIZE,
       gfx::VectorIconId::WINDOW_CONTROL_MINIMIZE);
   caption_button_container_->SetButtonImage(
       ash::CAPTION_BUTTON_ICON_CLOSE, gfx::VectorIconId::WINDOW_CONTROL_CLOSE);
@@ skipping 19 matching lines @@
 }
 
 gfx::Rect BrowserHeaderPainterAsh::GetPaintedBounds() const {
   return gfx::Rect(view_->width(), painted_height_);
 }
 
 gfx::Rect BrowserHeaderPainterAsh::GetTitleBounds() const {
   return ash::HeaderPainterUtil::GetTitleBounds(window_icon_,
       caption_button_container_, BrowserFrame::GetTitleFontList());
 }