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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/base/resource/resource_bundle_aurax11.cc

Issue 10270023: Add new ResourceBundle::Delegate interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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
« ui/base/resource/resource_bundle.cc ('K') | « ui/base/resource/resource_bundle_android.cc ('k') | ui/base/resource/resource_bundle_gtk.cc » ('j') | ui/base/resource/resource_bundle_gtk.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle_aurax11.cc
===================================================================
--- ui/base/resource/resource_bundle_aurax11.cc (revision 134688)
+++ ui/base/resource/resource_bundle_aurax11.cc (working copy)
@@ -17,7 +17,9 @@
FilePath path;
if (PathService::Get(base::DIR_MODULE, &path))
return path.AppendASCII(pak_name.c_str());
- return FilePath();
+
+ // Return just the name of the pack file.
+ return FilePath(pak_name.c_str());
}
} // namespace
@@ -39,7 +41,8 @@
}
}
-gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl) {
+const gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id,
+ ImageRTL rtl) {
// Flipped image is not used on ChromeOS.
DCHECK_EQ(rtl, RTL_DISABLED);
return GetImageNamed(resource_id);
« ui/base/resource/resource_bundle.cc ('K') | « ui/base/resource/resource_bundle_android.cc ('k') | ui/base/resource/resource_bundle_gtk.cc » ('j') | ui/base/resource/resource_bundle_gtk.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698