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

Unified Diff: content/shell/shell_main_delegate.cc

Issue 9835062: Mac content shell: Set up resources properly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
« no previous file with comments | « content/shell/paths_mac.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/shell_main_delegate.cc
diff --git a/content/shell/shell_main_delegate.cc b/content/shell/shell_main_delegate.cc
index d7bcb144e2fcaa1b0958476cbe65fed850ac2a01..6e0a08ba268079713502f0289f89177570c25a8e 100644
--- a/content/shell/shell_main_delegate.cc
+++ b/content/shell/shell_main_delegate.cc
@@ -109,9 +109,13 @@ void ShellMainDelegate::InitializeShellContentClient(
}
void ShellMainDelegate::InitializeResourceBundle() {
+ FilePath pak_file;
+#if defined(OS_MACOSX)
+ pak_file = GetResourcesPakFilePath();
+#else
FilePath pak_dir;
PathService::Get(base::DIR_MODULE, &pak_dir);
-
- FilePath pak_file = pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak"));
+ pak_file = pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak"));
+#endif
ui::ResourceBundle::InitSharedInstanceWithPakFile(pak_file);
}
« no previous file with comments | « content/shell/paths_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698