diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-21 00:45:40 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-21 00:45:40 +0000 |
| commit | 9c7453daefe625d26df5c96f2766ca09f7040c54 (patch) | |
| tree | a30e57dfca27c4785fc611c70bee8af56829d04e /chrome/browser/about_flags.cc | |
| parent | 6db833d1d8cd28e31a3cc816c397a32d795f849e (diff) | |
| download | chromium_src-9c7453daefe625d26df5c96f2766ca09f7040c54.zip chromium_src-9c7453daefe625d26df5c96f2766ca09f7040c54.tar.gz chromium_src-9c7453daefe625d26df5c96f2766ca09f7040c54.tar.bz2 | |
Checkpoint: android fixes towards compilation of unit_tests.
Dependent on clipboard.h change in https://chromiumcodereview.appspot.com/9264014
BUG=None
TEST=
Review URL: http://codereview.chromium.org/9226012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118567 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/about_flags.cc')
| -rw-r--r-- | chrome/browser/about_flags.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 6a5d068..d3fe09a 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -42,7 +42,7 @@ namespace about_flags { namespace { -const unsigned kOsAll = kOsMac | kOsWin | kOsLinux | kOsCrOS; +const unsigned kOsAll = kOsMac | kOsWin | kOsLinux | kOsCrOS | kOsAndroid; // Adds a |StringValue| to |list| for each platform where |bitmask| indicates // whether the experiment is available on that platform. @@ -785,6 +785,8 @@ int GetCurrentPlatform() { return kOsCrOS; #elif defined(OS_LINUX) || defined(OS_OPENBSD) return kOsLinux; +#elif defined(OS_ANDROID) + return kOsAndroid; #else #error Unknown platform #endif |