diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-07-06 22:52:08 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-07-08 17:55:07 +0100 |
| commit | cb7fae5ad30624a97df1fe8c72c8484de3e465dd (patch) | |
| tree | 240ffac15abe1b468effa6e5b26213f1aaf2b287 /chrome/common | |
| parent | 0c081bc606af7dc01818d2bc96062412ce93a460 (diff) | |
| download | external_chromium-cb7fae5ad30624a97df1fe8c72c8484de3e465dd.zip external_chromium-cb7fae5ad30624a97df1fe8c72c8484de3e465dd.tar.gz external_chromium-cb7fae5ad30624a97df1fe8c72c8484de3e465dd.tar.bz2 | |
Merge Chromium at r12.0.742.93: Compile fixes, add virtual destructors
New classes with virtual functions, but not virtual destructors.
This does not compile on Android, so adding them.
Change-Id: Ic9497dd6f83b7f3bafbab708e15ffd6507e82390
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/json_pref_store.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/common/json_pref_store.h b/chrome/common/json_pref_store.h index d8da37d..51bffe1 100644 --- a/chrome/common/json_pref_store.h +++ b/chrome/common/json_pref_store.h @@ -30,6 +30,9 @@ class JsonPrefStore : public PersistentPrefStore, class Delegate { public: virtual void OnPrefsRead(PrefReadError error, bool no_dir) = 0; +#ifdef ANDROID + virtual ~Delegate() {}; +#endif }; // |file_message_loop_proxy| is the MessageLoopProxy for a thread on which |