Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Unified Diff: chrome/browser/views/frame/opaque_browser_frame_view.cc

Issue 606060: windows: Theme the popup window with the incognito theme when we are in the i... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: fix lint error Created 10 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/views/frame/opaque_browser_frame_view.cc
===================================================================
--- chrome/browser/views/frame/opaque_browser_frame_view.cc (revision 38675)
+++ chrome/browser/views/frame/opaque_browser_frame_view.cc (working copy)
@@ -552,14 +552,18 @@
// 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;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698