windows: Theme the popup window with the incognito theme when we are in the i...

chrome/browser/views/frame/opaque_browser_frame_view.cc

 // Copyright (c) 2010 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/views/frame/opaque_browser_frame_view.h"
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/font.h"
 #include "app/gfx/path.h"
 #include "app/l10n_util.h"
@@ skipping 534 matching lines @@
   SkBitmap* bottom_edge = tp->GetBitmapNamed(IDR_WINDOW_BOTTOM_CENTER);
 
 
   // Window frame mode and color
   SkBitmap* theme_frame;
   SkColor frame_color;
 
   // Never theme app and popup windows.
   if (!browser_view_->IsBrowserTypeNormal()) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
+    bool is_off_the_record = browser_view_->IsOffTheRecord();
     if (ShouldPaintAsActive()) {
-      theme_frame = rb.GetBitmapNamed(IDR_FRAME);
-      frame_color = browser_view_->IsOffTheRecord() ?
+      theme_frame = rb.GetBitmapNamed(is_off_the_record ?
+                                      IDR_THEME_FRAME_INCOGNITO : IDR_FRAME);
+      frame_color =  is_off_the_record ?
           ResourceBundle::frame_color_incognito :
           ResourceBundle::frame_color;
     } else {
-      theme_frame = rb.GetBitmapNamed(IDR_THEME_FRAME_INACTIVE);
-      frame_color = browser_view_->IsOffTheRecord() ?
+      theme_frame = rb.GetBitmapNamed(is_off_the_record ?
+                                      IDR_THEME_FRAME_INCOGNITO_INACTIVE :
+                                      IDR_THEME_FRAME_INACTIVE);
+      frame_color = is_off_the_record ?
           ResourceBundle::frame_color_incognito_inactive :
           ResourceBundle::frame_color_inactive;
     }
   } else if (!browser_view_->IsOffTheRecord()) {
     if (ShouldPaintAsActive()) {
       theme_frame = tp->GetBitmapNamed(IDR_THEME_FRAME);
       frame_color = tp->GetColor(BrowserThemeProvider::COLOR_FRAME);
     } else {
       theme_frame = tp->GetBitmapNamed(IDR_THEME_FRAME_INACTIVE);
       frame_color = tp->GetColor(BrowserThemeProvider::COLOR_FRAME_INACTIVE);
@@ skipping 484 matching lines @@
   static bool initialized = false;
   if (!initialized) {
 #if defined(OS_WIN)
     title_font_ = new gfx::Font(win_util::GetWindowTitleFont());
 #else
     title_font_ = new gfx::Font();
 #endif
     initialized = true;
   }
 }