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

Unified Diff: ui/base/resource/resource_bundle_win.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
« no previous file with comments | « ui/base/resource/resource_bundle_unittest.cc ('k') | ui/test/test_suite.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle_win.cc
===================================================================
--- ui/base/resource/resource_bundle_win.cc (revision 135347)
+++ ui/base/resource/resource_bundle_win.cc (working copy)
@@ -6,6 +6,7 @@
#include "base/logging.h"
#include "base/path_service.h"
+#include "base/utf_string_conversions.h"
#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/resource/resource_data_dll_win.h"
@@ -27,7 +28,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(ASCIIToUTF16(pak_name));
}
} // end anonymous namespace
@@ -53,14 +56,14 @@
default:
if (use_hidpi) {
AddDataPack(GetResourcesPakFilePath("theme_resources_2x.pak"),
- ResourceHandle::kScaleFactor200x);
+ ResourceHandle::kScaleFactor200x);
AddDataPack(GetResourcesPakFilePath("ui_resources_2x.pak"),
- ResourceHandle::kScaleFactor200x);
+ ResourceHandle::kScaleFactor200x);
} else {
AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"),
- ResourceHandle::kScaleFactor100x);
+ ResourceHandle::kScaleFactor100x);
AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"),
- ResourceHandle::kScaleFactor100x);
+ ResourceHandle::kScaleFactor100x);
}
break;
}
« no previous file with comments | « ui/base/resource/resource_bundle_unittest.cc ('k') | ui/test/test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698