diff options
| author | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
| commit | 3345a6884c488ff3a535c2c9acdd33d74b37e311 (patch) | |
| tree | 7784b988ef1698cb6967ea1bdf07616237716c6c /chrome/browser/spellcheck_host_observer.h | |
| parent | efc8475837ec58186051f23bb03542620424f6ce (diff) | |
| download | external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.zip external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.gz external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.bz2 | |
Merge Chromium at 7.0.540.0 : Initial merge by git
Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.
Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
Diffstat (limited to 'chrome/browser/spellcheck_host_observer.h')
| -rw-r--r-- | chrome/browser/spellcheck_host_observer.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/spellcheck_host_observer.h b/chrome/browser/spellcheck_host_observer.h index cd324f8..91d135a 100644 --- a/chrome/browser/spellcheck_host_observer.h +++ b/chrome/browser/spellcheck_host_observer.h @@ -4,16 +4,23 @@ #ifndef CHROME_BROWSER_SPELLCHECK_HOST_OBSERVER_H_ #define CHROME_BROWSER_SPELLCHECK_HOST_OBSERVER_H_ +#pragma once // Observer for the SpellCheckHost. class SpellCheckHostObserver { public: // Invoked on the UI thread when SpellCheckHost is initialized. virtual void SpellCheckHostInitialized() = 0; +<<<<<<< HEAD #ifdef ANDROID // TODO: Upstream virtual ~SpellCheckHostObserver() { } #endif +======= + + protected: + virtual ~SpellCheckHostObserver() {} +>>>>>>> Chromium at release 7.0.540.0 }; #endif // CHROME_BROWSER_SPELLCHECK_HOST_OBSERVER_H_ |