Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2272)

Unified Diff: base/values.h

Issue 7714024: Remove check_on_delete for ChromeOS to avoid change to sizeof(Value) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | base/values.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/values.h
diff --git a/base/values.h b/base/values.h
index 19a3c92fbd5ce5e2152e0d679e369cd36e845a64..d33d03197ab0ec3e047cff8b9dc1add4ead2d718 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);
};
« no previous file with comments | « no previous file | base/values.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698