diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-23 02:42:45 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-23 02:42:45 +0000 |
| commit | 2707fe32e964f0c22d87971d305f6e0fb5c3a158 (patch) | |
| tree | b9e5c69ceb1ed47d0055f7d9b1cad48e0238689c /chrome/common | |
| parent | bfdb3b89730a019b5837689660f565bc60243af2 (diff) | |
| download | chromium_src-2707fe32e964f0c22d87971d305f6e0fb5c3a158.zip chromium_src-2707fe32e964f0c22d87971d305f6e0fb5c3a158.tar.gz chromium_src-2707fe32e964f0c22d87971d305f6e0fb5c3a158.tar.bz2 | |
Make chromeos build use shared object to load battery
functionality. Call into it and show new battery images
Review URL: http://codereview.chromium.org/215025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26898 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/chrome_paths.cc | 8 | ||||
| -rw-r--r-- | chrome/common/chrome_paths.h | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc index bb30e80..1a2209b 100644 --- a/chrome/common/chrome_paths.cc +++ b/chrome/common/chrome_paths.cc @@ -172,6 +172,14 @@ bool PathProvider(int key, FilePath* result) { #endif } break; +#if defined(OS_CHROMEOS) + case chrome::FILE_CHROMEOS_API: + if (!PathService::Get(base::DIR_MODULE, &cur)) + return false; + cur = cur.Append(FILE_PATH_LITERAL("chromeos")); + cur = cur.Append(FILE_PATH_LITERAL("libchromeos-power.so")); + break; +#endif // The following are only valid in the development environment, and // will fail if executed from an installed executable (because the // generated path won't exist). diff --git a/chrome/common/chrome_paths.h b/chrome/common/chrome_paths.h index da61650..1577fc2 100644 --- a/chrome/common/chrome_paths.h +++ b/chrome/common/chrome_paths.h @@ -5,6 +5,8 @@ #ifndef CHROME_COMMON_CHROME_PATHS_H__ #define CHROME_COMMON_CHROME_PATHS_H__ +#include "build/build_config.h" + // This file declares path keys for the chrome module. These can be used with // the PathService to access various special directories and files. @@ -33,6 +35,10 @@ enum { FILE_LIBAVCODEC, // full path to libavcodec media decoding library. FILE_LIBAVFORMAT, // full path to libavformat media parsing library. FILE_LIBAVUTIL, // full path to libavutil media utility library. +#if defined(OS_CHROMEOS) + FILE_CHROMEOS_API, // full path to chrome os api shared object. +#endif + // Valid only in development environment; TODO(darin): move these DIR_TEST_DATA, // directory where unit test data resides |