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

Unified Diff: content/shell/shell_main_delegate.cc

Issue 10035034: Implement the skeleton of an android content shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed drawable png as it was checked in separately. 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
Index: content/shell/shell_main_delegate.cc
diff --git a/content/shell/shell_main_delegate.cc b/content/shell/shell_main_delegate.cc
index 06e2907737a69763bc3495a83ab4d78187037d0d..7aa2a4535316d97c5964c8d95c77d3bbf04b9a92 100644
--- a/content/shell/shell_main_delegate.cc
+++ b/content/shell/shell_main_delegate.cc
@@ -25,6 +25,9 @@ ShellMainDelegate::ShellMainDelegate() {
}
ShellMainDelegate::~ShellMainDelegate() {
+#if defined(OS_ANDROID)
+ NOTREACHED();
+#endif
}
bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
@@ -117,7 +120,14 @@ void ShellMainDelegate::InitializeResourceBundle() {
pak_file = GetResourcesPakFilePath();
#else
FilePath pak_dir;
+
+#if defined(OS_ANDROID)
+ DCHECK(PathService::Get(base::DIR_ANDROID_APP_DATA, &pak_dir));
+ pak_dir = pak_dir.Append(FILE_PATH_LITERAL("paks"));
+#else
PathService::Get(base::DIR_MODULE, &pak_dir);
+#endif
+
pak_file = pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak"));
#endif
ui::ResourceBundle::InitSharedInstanceWithPakFile(pak_file);

Powered by Google App Engine
This is Rietveld 408576698