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 | |
| 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')
| -rw-r--r-- | chrome/browser/prefs/pref_service.h | 3 | ||||
| -rw-r--r-- | chrome/browser/profiles/profile.h | 3 | ||||
| -rw-r--r-- | chrome/common/json_pref_store.h | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/chrome/browser/prefs/pref_service.h b/chrome/browser/prefs/pref_service.h index 9d360ba..3788622 100644 --- a/chrome/browser/prefs/pref_service.h +++ b/chrome/browser/prefs/pref_service.h @@ -116,6 +116,9 @@ class PrefService : public base::NonThreadSafe, class Delegate { public: virtual void OnPrefsLoaded(PrefService* prefs, bool success) = 0; +#ifdef ANDROID + virtual ~Delegate() {}; +#endif }; // JsonPrefStore::Delegate implementaion. diff --git a/chrome/browser/profiles/profile.h b/chrome/browser/profiles/profile.h index acbf7cb..a27496e 100644 --- a/chrome/browser/profiles/profile.h +++ b/chrome/browser/profiles/profile.h @@ -137,6 +137,9 @@ class Profile { public: // Called when creation of the profile is finished. virtual void OnProfileCreated(Profile* profile, bool success) = 0; +#ifdef ANDROID + virtual ~Delegate() {} +#endif }; // Key used to bind profile to the widget with which it is associated. 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 |