Android resource PAKs and native lib file path changes.

chrome/common/chrome_paths.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 "chrome/common/chrome_paths.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/sys_info.h"
 #include "base/version.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths_internal.h"
 
+#if defined(OS_ANDROID)

[brettw, 2012/08/02 19:38:53]

I'd not bother with this ifdef and put the include in the group above. Generally
we only put the includes in an ifdef that won't compile, which keeps things a
bit easier to follow for files with a lot of ifdefs.

[benm (inactive), 2012/08/03 11:11:11]

Done.

+#include "ui/base/ui_base_paths.h"
+#endif
+
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #endif
 
 namespace {
 
 // File name of the internal Flash plugin on different platforms.
 const FilePath::CharType kInternalFlashPluginFileName[] =
 #if defined(OS_MACOSX)
     FILE_PATH_LITERAL("Flash Player Plugin for Chrome.plugin");
@@ skipping 278 matching lines @@
       break;
 #endif
     case chrome::FILE_RESOURCES_PACK:
 #if defined(OS_MACOSX)
       if (base::mac::AmIBundled()) {
         cur = base::mac::FrameworkBundlePath();
         cur = cur.Append(FILE_PATH_LITERAL("Resources"))
                  .Append(FILE_PATH_LITERAL("resources.pak"));
         break;
       }
-      // If we're not bundled on mac, resources.pak should be next to the
-      // binary (e.g., for unit tests).
-#endif
+#elif defined(OS_ANDROID)
+      if (!PathService::Get(ui::DIR_RESOURCE_PAKS_ANDROID, &cur))
+        return false;
+#else
+      // If we're not bundled on mac or Android, resources.pak should be next
+      // to the binary (e.g., for unit tests).
       if (!PathService::Get(base::DIR_MODULE, &cur))
         return false;
+#endif
       cur = cur.Append(FILE_PATH_LITERAL("resources.pak"));
       break;
     case chrome::DIR_RESOURCES_EXTENSION:
       if (!PathService::Get(base::DIR_MODULE, &cur))
         return false;
       cur = cur.Append(FILE_PATH_LITERAL("resources"))
                .Append(FILE_PATH_LITERAL("extension"));
       break;
 #if defined(OS_CHROMEOS)
     case chrome::DIR_CHROMEOS_WALLPAPERS:
@@ skipping 109 matching lines @@
   return true;
 }
 
 // This cannot be done as a static initializer sadly since Visual Studio will
 // eliminate this object file if there is no direct entry point into it.
 void RegisterPathProvider() {
   PathService::RegisterProvider(PathProvider, PATH_START, PATH_END);
 }
 
 }  // namespace chrome