diff options
| author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 05:40:40 +0000 |
|---|---|---|
| committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-24 05:40:40 +0000 |
| commit | e98fad92b695f3a6468b48a95eb8256f64e0a8f5 (patch) | |
| tree | 1b0b76824d15f7116814a009273c224ae9db3a25 /base/values.h | |
| parent | b7c865da33615223545eebbda624c2218bc241cf (diff) | |
| download | chromium_src-e98fad92b695f3a6468b48a95eb8256f64e0a8f5.zip chromium_src-e98fad92b695f3a6468b48a95eb8256f64e0a8f5.tar.gz chromium_src-e98fad92b695f3a6468b48a95eb8256f64e0a8f5.tar.bz2 | |
Remove check_on_delete for ChromeOS to avoid change to sizeof(Value)
BUG=chromium-os:19577
TEST=chrome compiles on all platforms
Review URL: http://codereview.chromium.org/7714024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97997 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/values.h')
| -rw-r--r-- | base/values.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/base/values.h b/base/values.h index 19a3c92..d33d031 100644 --- a/base/values.h +++ b/base/values.h @@ -113,9 +113,15 @@ class BASE_EXPORT Value { // NULLs are considered equal but different from Value::CreateNullValue(). static bool Equals(const Value* a, const Value* b); +#if !defined(OS_CHROMEOS) + // NOTE: We pass Value from libcros tp Chrome, so changing the size of Value + // breaks it. TODO(stevenjb): Eliminate that dependency (crosbug.com/19576). // TODO(sky) bug 91396: remove this when we figure out 91396. // If true crash when deleted. void set_check_on_delete(bool value) { check_on_delete_ = value; } +#else + void set_check_on_delete(bool value) {} +#endif protected: // This isn't safe for end-users (they should use the Create*Value() @@ -125,8 +131,10 @@ class BASE_EXPORT Value { private: Type type_; +#if !defined(OS_CHROMEOS) // See description above setter. bool check_on_delete_; +#endif DISALLOW_COPY_AND_ASSIGN(Value); }; |