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

Unified Diff: chrome/browser/themes/theme_service.cc

Issue 8789016: Revert 112839 (it probably caused http://crbug.com/106299 ) - GTK: Port omnibox drawing from GdkG... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years 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/themes/theme_service.h ('k') | chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/themes/theme_service.cc
===================================================================
--- chrome/browser/themes/theme_service.cc (revision 112901)
+++ chrome/browser/themes/theme_service.cc (working copy)
@@ -220,20 +220,6 @@
LoadThemePrefs();
}
-const gfx::Image* ThemeService::GetImageNamed(int id) const {
- DCHECK(CalledOnValidThread());
-
- const gfx::Image* image = NULL;
-
- if (theme_pack_.get())
- image = theme_pack_->GetImageNamed(id);
-
- if (!image)
- image = &rb_.GetNativeImageNamed(id);
-
- return image;
-}
-
SkBitmap* ThemeService::GetBitmapNamed(int id) const {
DCHECK(CalledOnValidThread());
Property changes on: chrome/browser/themes/theme_service.cc
___________________________________________________________________
Added: svn:mergeinfo
« no previous file with comments | « chrome/browser/themes/theme_service.h ('k') | chrome/browser/ui/gtk/omnibox/omnibox_popup_view_gtk.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698