Committing http://codereview.chromium.org/7084022/ for Satoshi Matsuzaki.

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

 // Copyright (c) 2011 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/opaque_browser_frame_view.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 718 matching lines @@
 
   // Allow customization of these attributes.
   SkBitmap* left = NULL;
   SkBitmap* right = NULL;
   int top_offset = 0;
   ModifyMaximizedFramePainting(&top_offset, &left, &right);
 
   // Never theme app and popup windows.
   if (!browser_view_->IsBrowserTypeNormal()) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
-    theme_frame = rb.GetBitmapNamed(ShouldPaintAsActive() ?
-        IDR_FRAME : IDR_FRAME_INACTIVE);
+    bool is_incognito = browser_view_->IsOffTheRecord();
+    if (ShouldPaintAsActive()) {
+      theme_frame = rb.GetBitmapNamed(is_incognito ?
+                                      IDR_THEME_FRAME_INCOGNITO : IDR_FRAME);
+    } else {
+      theme_frame = rb.GetBitmapNamed(is_incognito ?
+                                      IDR_THEME_FRAME_INCOGNITO_INACTIVE :
+                                      IDR_FRAME_INACTIVE);
+    }
   } else if (!browser_view_->IsOffTheRecord()) {
     theme_frame = tp->GetBitmapNamed(ShouldPaintAsActive() ?
         IDR_THEME_FRAME : IDR_THEME_FRAME_INACTIVE);
   } else {
     theme_frame = tp->GetBitmapNamed(ShouldPaintAsActive() ?
         IDR_THEME_FRAME_INCOGNITO : IDR_THEME_FRAME_INCOGNITO_INACTIVE);
   }
   // Draw the theme frame.  It must be aligned with the tabstrip as if we were
   // in restored mode.  Note that the top of the tabstrip is
   // kTabstripTopShadowThickness px off the top of the screen.
@@ skipping 447 matching lines @@
                    std::max(0, width - (2 * border_thickness)),
                    std::max(0, height - GetReservedHeight() -
                        top_height - border_thickness));
 }
 
 void OpaqueBrowserFrameView::RegisterLoginNotifications() {
   PrefService* pref_service = browser_view_->browser()->profile()->GetPrefs();
   DCHECK(pref_service);
   username_pref_.Init(prefs::kGoogleServicesUsername, pref_service, this);
 }