Add pak file support for content shell and android apks.

content/shell/shell_main_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/shell/shell_main_delegate.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "content/public/browser/browser_main_runner.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "content/shell/shell_browser_main.h"
 #include "content/shell/shell_content_browser_client.h"
 #include "content/shell/shell_content_renderer_client.h"
 #include "content/shell/shell_switches.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 
+#if defined(OS_ANDROID)
+#include "base/global_descriptors_posix.h"
+#include "content/shell/android/shell_descriptors.h"
+#endif
+
 #if defined(OS_MACOSX)
 #include "content/shell/paths_mac.h"
 #endif  // OS_MACOSX
 
 namespace {
 
 void InitLogging() {
   FilePath log_filename;
   PathService::Get(base::DIR_EXE, &log_filename);
   log_filename = log_filename.AppendASCII("content_shell.log");
@@ skipping 50 matching lines @@
   browser_runner_.reset(content::BrowserMainRunner::Create());
   int exit_code = browser_runner_->Initialize(main_function_params);
   DCHECK(exit_code < 0)
       << "BrowserRunner::Initialize failed in ShellMainDelegate";
 
   return exit_code;
 #endif
 }
 
 void ShellMainDelegate::InitializeResourceBundle() {
+#if defined(OS_ANDROID)
+  // In the Android case, the renderer runs with a different UID and can never
+  // access the file system.  So we are passed a file descriptor to the
+  // ResourceBundle pak at launch time.
+  int pak_fd =
+      base::GlobalDescriptors::GetInstance()->MaybeGet(kShellPakDescriptor);
+  if (pak_fd != base::kInvalidPlatformFileValue) {
+    ui::ResourceBundle::InitSharedInstanceWithPakFile(pak_fd, false);
+    ResourceBundle::GetSharedInstance().AddDataPackFromFile(
+        pak_fd, ui::SCALE_FACTOR_100P);
+    return;
+  }
+#endif
+
   FilePath pak_file;
 #if defined(OS_MACOSX)
   pak_file = GetResourcesPakFilePath();
 #else
   FilePath pak_dir;
 
 #if defined(OS_ANDROID)
   bool got_path = PathService::Get(base::DIR_ANDROID_APP_DATA, &pak_dir);
   DCHECK(got_path);
   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::InitSharedInstanceWithPakPath(pak_file);
 }
 
 content::ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() {
   browser_client_.reset(new content::ShellContentBrowserClient);
   return browser_client_.get();
 }
 
 content::ContentRendererClient*
     ShellMainDelegate::CreateContentRendererClient() {
   renderer_client_.reset(new content::ShellContentRendererClient);
   return renderer_client_.get();
 }