diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-27 22:03:44 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-27 22:03:44 +0000 |
| commit | fe1b06cffd493d5cfc02ede50b93e7a68d67db72 (patch) | |
| tree | f671630445919452d38da6dbc0a707193a675f65 /chrome | |
| parent | 1cbb2c38ef8e19833d3b75717f3f84a33aa7323e (diff) | |
| download | chromium_src-fe1b06cffd493d5cfc02ede50b93e7a68d67db72.zip chromium_src-fe1b06cffd493d5cfc02ede50b93e7a68d67db72.tar.gz chromium_src-fe1b06cffd493d5cfc02ede50b93e7a68d67db72.tar.bz2 | |
GTK: Fix theme overlay in off the record mode.
We weren't detecting whether we were in OTR mode like we were in
opaque_browser_frame_view.cc.
BUG=21046
TEST=none
Review URL: http://codereview.chromium.org/553125
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37322 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/gtk/browser_window_gtk.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc index 22ed0c7..8afa65e 100644 --- a/chrome/browser/gtk/browser_window_gtk.cc +++ b/chrome/browser/gtk/browser_window_gtk.cc @@ -388,12 +388,12 @@ gboolean BrowserWindowGtk::OnCustomFrameExpose(GtkWidget* widget, gdk_cairo_rectangle(cr, &event->area); cairo_clip(cr); + bool off_the_record = window->browser()->profile()->IsOffTheRecord(); int image_name; if (window->IsActive()) { - image_name = window->browser()->profile()->IsOffTheRecord() ? - IDR_THEME_FRAME_INCOGNITO : IDR_THEME_FRAME; + image_name = off_the_record ? IDR_THEME_FRAME_INCOGNITO : IDR_THEME_FRAME; } else { - image_name = window->browser()->profile()->IsOffTheRecord() ? + image_name = off_the_record ? IDR_THEME_FRAME_INCOGNITO_INACTIVE : IDR_THEME_FRAME_INACTIVE; } CairoCachedSurface* surface = theme_provider->GetSurfaceNamed( @@ -409,7 +409,8 @@ gboolean BrowserWindowGtk::OnCustomFrameExpose(GtkWidget* widget, cairo_fill(cr); } - if (theme_provider->HasCustomImage(IDR_THEME_FRAME_OVERLAY)) { + if (theme_provider->HasCustomImage(IDR_THEME_FRAME_OVERLAY) && + !off_the_record) { CairoCachedSurface* theme_overlay = theme_provider->GetSurfaceNamed( window->IsActive() ? IDR_THEME_FRAME_OVERLAY : IDR_THEME_FRAME_OVERLAY_INACTIVE, widget); |