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

Unified Diff: apps/shell/app/shell_main_delegate.cc

Issue 176873016: [AppShell] Remove chrome_100_percent.pak dependancy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update Created 6 years, 9 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
« apps/apps.gypi ('K') | « apps/apps.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/shell/app/shell_main_delegate.cc
diff --git a/apps/shell/app/shell_main_delegate.cc b/apps/shell/app/shell_main_delegate.cc
index 4c7650ae09a500387302a580484a45bf6678fd59..13706cda47a78edcf9960e4953b1c0c3a6a0e880 100644
--- a/apps/shell/app/shell_main_delegate.cc
+++ b/apps/shell/app/shell_main_delegate.cc
@@ -87,12 +87,10 @@ bool ShellMainDelegate::ProcessNeedsResourceBundle(
}
void ShellMainDelegate::InitializeResourceBundle() {
- ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL);
-
base::FilePath pak_dir;
PathService::Get(base::DIR_MODULE, &pak_dir);
- ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
- pak_dir.AppendASCII("app_shell.pak"), ui::SCALE_FACTOR_NONE);
+ ui::ResourceBundle::InitSharedInstanceWithPakPath(
+ pak_dir.AppendASCII("app_shell.pak"));
}
} // namespace apps
« apps/apps.gypi ('K') | « apps/apps.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698