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

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

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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/app/shell_main_delegate.cc
diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc
index 63f3f298bac2eced5055193bc41ad6b38e10daaf..1e77b2050fd457cca90a9e619f0f73031ee0c86b 100644
--- a/content/shell/app/shell_main_delegate.cc
+++ b/content/shell/app/shell_main_delegate.cc
@@ -291,6 +291,7 @@ void ShellMainDelegate::ZygoteForked() {
void ShellMainDelegate::InitializeResourceBundle() {
#if defined(OS_ANDROID)
+ LOG(ERROR) << "ShellMainDelegate::InitializeResourceBundle()";
// On Android, the renderer runs with a different UID and can never access
// the file system. Use the file descriptor passed in at launch time.
auto* global_descriptors = base::GlobalDescriptors::GetInstance();
@@ -315,6 +316,7 @@ void ShellMainDelegate::InitializeResourceBundle() {
global_descriptors->Set(kShellPakDescriptor, pak_fd, pak_region);
}
DCHECK_GE(pak_fd, 0);
+ LOG(ERROR) << "ShellMainDelegate::InitializeResourceBundle() - crash now?";
// This is clearly wrong. See crbug.com/330930
ui::ResourceBundle::InitSharedInstanceWithPakFileRegion(base::File(pak_fd),
pak_region);

Powered by Google App Engine
This is Rietveld 408576698