Index: remoting/base/resources.cc |
diff --git a/remoting/base/resources.cc b/remoting/base/resources.cc |
index cd7e4869957cadd40de619b0a58bd23fd4bb97c8..32e62c4240cb4ae435303f52873e07acaafa3221 100644 |
--- a/remoting/base/resources.cc |
+++ b/remoting/base/resources.cc |
@@ -11,16 +11,24 @@ |
namespace remoting { |
+namespace { |
+const char kLocaleResourcesDirName[] = "remoting_locales"; |
+const char kCommonResourcesFileName[] = "chrome_remote_desktop.pak"; |
+} // namespace |
+ |
// Loads chromoting resources. |
bool LoadResources(const std::string& locale) { |
FilePath path; |
if (!PathService::Get(base::DIR_MODULE, &path)) |
return false; |
- path = path.Append(FILE_PATH_LITERAL("remoting_locales")); |
- PathService::Override(ui::DIR_LOCALES, path); |
+ PathService::Override(ui::DIR_LOCALES, |
+ path.AppendASCII(kLocaleResourcesDirName)); |
ui::ResourceBundle::InitSharedInstanceLocaleOnly(locale, NULL); |
+ ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath( |
+ path.AppendASCII(kCommonResourcesFileName), ui::SCALE_FACTOR_100P); |
+ |
return true; |
} |