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

Unified Diff: chrome/browser/ui/views/theme_background.cc

Issue 10453101: Convert most of the rest of chrome to ImageSkia (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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 | « chrome/browser/ui/views/tabs/tab_strip.cc ('k') | chrome/browser/ui/views/toolbar_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/theme_background.cc
diff --git a/chrome/browser/ui/views/theme_background.cc b/chrome/browser/ui/views/theme_background.cc
index 52f3f1df94fcee0f3c31576983aa15920513b5a5..6cb8404a17965621bce1c47e83efea79172a7b38 100644
--- a/chrome/browser/ui/views/theme_background.cc
+++ b/chrome/browser/ui/views/theme_background.cc
@@ -21,25 +21,25 @@ ThemeBackground::ThemeBackground(BrowserView* browser_view)
}
void ThemeBackground::Paint(gfx::Canvas* canvas, views::View* view) const {
- SkBitmap* background;
+ gfx::ImageSkia* background;
// Never theme app and popup windows.
if (!browser_view_->IsBrowserTypeNormal()) {
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
if (browser_view_->IsActive())
- background = rb.GetBitmapNamed(IDR_FRAME);
+ background = rb.GetImageSkiaNamed(IDR_FRAME);
else
- background = rb.GetBitmapNamed(IDR_THEME_FRAME_INACTIVE);
+ background = rb.GetImageSkiaNamed(IDR_THEME_FRAME_INACTIVE);
} else {
Profile* profile = browser_view_->browser()->profile();
ui::ThemeProvider* theme = ThemeServiceFactory::GetForProfile(profile);
if (browser_view_->IsActive()) {
- background = theme->GetBitmapNamed(
+ background = theme->GetImageSkiaNamed(
profile->IsOffTheRecord() ?
IDR_THEME_FRAME_INCOGNITO : IDR_THEME_FRAME);
} else {
- background = theme->GetBitmapNamed(
+ background = theme->GetImageSkiaNamed(
profile->IsOffTheRecord() ?
IDR_THEME_FRAME_INCOGNITO_INACTIVE : IDR_THEME_FRAME_INACTIVE);
}
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_strip.cc ('k') | chrome/browser/ui/views/toolbar_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698