diff options
| author | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-31 07:39:29 +0000 |
|---|---|---|
| committer | glen@chromium.org <glen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-31 07:39:29 +0000 |
| commit | 86681b9dccc5d4ea00d5f767f0e9bf417c618cc9 (patch) | |
| tree | c1eada026dcccecd2163ce62d1e1472bce267610 /chrome/browser/views/autocomplete | |
| parent | 878ae96bea0bb797e2a47b7a685c56cb6b5601d0 (diff) | |
| download | chromium_src-86681b9dccc5d4ea00d5f767f0e9bf417c618cc9.zip chromium_src-86681b9dccc5d4ea00d5f767f0e9bf417c618cc9.tar.gz chromium_src-86681b9dccc5d4ea00d5f767f0e9bf417c618cc9.tar.bz2 | |
Use the right frame type on startup, do proper swapping of frames when themes change. Leave the native frame decision up to the ThemeProvider.
BUG=12890
TEST=In Aero, unstall a theme, reset to default, install again, restart, reset theme to default. Make sure that the Aero frame changes to the themed frame and back again appropriately.
Review URL: http://codereview.chromium.org/118053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17301 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/autocomplete')
| -rw-r--r-- | chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc index 9443639..7ba39cc 100644 --- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc +++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc @@ -14,7 +14,7 @@ #include "app/gfx/path.h" #include "app/l10n_util.h" #include "app/resource_bundle.h" -#include "app/win_util.h" +#include "app/theme_provider.h" #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h" #include "chrome/browser/autocomplete/autocomplete_popup_model.h" #include "chrome/browser/views/autocomplete/autocomplete_popup_win.h" @@ -840,7 +840,7 @@ void AutocompletePopupContentsView::MakeContentsPath( void AutocompletePopupContentsView::UpdateBlurRegion() { // We only support background blurring on Vista with Aero-Glass enabled. - if (!win_util::ShouldUseVistaFrame() || !GetWidget()) + if (!GetThemeProvider()->ShouldUseNativeFrame() || !GetWidget()) return; // Provide a blurred background effect within the contents region of the @@ -868,7 +868,7 @@ void AutocompletePopupContentsView::MakeCanvasTransparent( gfx::Canvas* canvas) { // Allow the window blur effect to show through the popup background. SkPaint paint; - SkColor transparency = win_util::ShouldUseVistaFrame() ? + SkColor transparency = GetThemeProvider()->ShouldUseNativeFrame() ? kGlassPopupTransparency : kOpaquePopupTransparency; paint.setColor(SkColorSetARGB(transparency, 255, 255, 255)); paint.setPorterDuffXfermode(SkPorterDuff::kDstIn_Mode); |