diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-22 21:44:31 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-22 21:44:31 +0000 |
| commit | b31117886d85c32c31adffbd08d6cad074932dce (patch) | |
| tree | a4e3ad7a69e98e5f013064c42018dd181debc1e1 /base | |
| parent | ff98d7f0e27e6ce053a9359adabf2da6ceb942e5 (diff) | |
| download | chromium_src-b31117886d85c32c31adffbd08d6cad074932dce.zip chromium_src-b31117886d85c32c31adffbd08d6cad074932dce.tar.gz chromium_src-b31117886d85c32c31adffbd08d6cad074932dce.tar.bz2 | |
Update Android's base_paths to match other platforms.
BUG=none
TEST=no change
Review URL: http://codereview.chromium.org/9839017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128311 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/base.gypi | 5 | ||||
| -rw-r--r-- | base/base_paths.h | 7 | ||||
| -rw-r--r-- | base/base_paths_android.h | 25 |
3 files changed, 31 insertions, 6 deletions
diff --git a/base/base.gypi b/base/base.gypi index 00f169e..e2423e5 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -43,6 +43,7 @@ 'base_paths.cc', 'base_paths.h', 'base_paths_android.cc', + 'base_paths_android.h', 'base_paths_mac.h', 'base_paths_mac.mm', 'base_paths_posix.cc', @@ -62,8 +63,8 @@ 'callback_internal.cc', 'callback_internal.h', 'cancelable_callback.h', - 'chromeos/chromeos_version.cc', - 'chromeos/chromeos_version.h', + 'chromeos/chromeos_version.cc', + 'chromeos/chromeos_version.h', 'command_line.cc', 'command_line.h', 'compiler_specific.h', diff --git a/base/base_paths.h b/base/base_paths.h index 708d8e8..f1f3f16 100644 --- a/base/base_paths.h +++ b/base/base_paths.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -15,6 +15,8 @@ #include "base/base_paths_win.h" #elif defined(OS_MACOSX) #include "base/base_paths_mac.h" +#elif defined(OS_ANDROID) +#include "base/base_paths_android.h" #endif namespace base { @@ -40,9 +42,6 @@ enum BasePathKey { // This is $XDG_CACHE_HOME on Linux and // ~/Library/Caches on Mac. #endif -#if defined(OS_ANDROID) - DIR_ANDROID_APP_DATA, // Directory where to put android app's data. -#endif PATH_END }; diff --git a/base/base_paths_android.h b/base/base_paths_android.h new file mode 100644 index 0000000..2f881fe --- /dev/null +++ b/base/base_paths_android.h @@ -0,0 +1,25 @@ +// 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. + +#ifndef BASE_BASE_PATHS_ANDROID_H_ +#define BASE_BASE_PATHS_ANDROID_H_ +#pragma once + +// This file declares Android-specific path keys for the base module. +// These can be used with the PathService to access various special +// directories and files. + +namespace base { + +enum { + PATH_ANDROID_START = 300, + + DIR_ANDROID_APP_DATA, // Directory where to put Android app's data. + + PATH_ANDROID_END +}; + +} // namespace base + +#endif // BASE_BASE_PATHS_ANDROID_H_ |