summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ash/wm/system_modal_container_event_filter_delegate.h2
-rw-r--r--base/debug/trace_event_impl.h2
-rw-r--r--base/prefs/pref_observer.h2
-rw-r--r--base/prefs/public/pref_change_registrar.h3
-rw-r--r--base/prefs/public/pref_member.h3
-rw-r--r--base/threading/post_task_and_reply_impl.h2
-rw-r--r--cc/layer_animation_event_observer.h3
-rw-r--r--cc/layer_tree_host.h4
-rw-r--r--cc/layer_tree_host_impl.h5
-rw-r--r--cc/picture_layer_impl.h5
-rw-r--r--cc/picture_layer_tiling.h3
-rw-r--r--cc/rate_limiter.h3
-rw-r--r--cc/video_frame_provider.h3
-rw-r--r--chrome/browser/certificate_manager_model.h2
-rw-r--r--chrome/browser/download/download_danger_prompt.h2
-rw-r--r--chrome/browser/extensions/activity_log.h2
-rw-r--r--chrome/browser/extensions/api/developer_private/entry_picker.h2
-rw-r--r--chrome/browser/extensions/api/page_capture/page_capture_api.h2
-rw-r--r--chrome/browser/extensions/app_notify_channel_setup.h4
-rw-r--r--chrome/browser/extensions/event_router.h2
-rw-r--r--chrome/browser/extensions/extension_function.h2
-rw-r--r--chrome/browser/extensions/extension_keybinding_registry.h2
-rw-r--r--chrome/browser/extensions/extension_scoped_prefs.h2
-rw-r--r--chrome/browser/extensions/extension_warning_service.h2
-rw-r--r--chrome/browser/favicon/favicon_handler_delegate.h2
-rw-r--r--chrome/browser/google_apis/auth_service_interface.h2
-rw-r--r--chrome/browser/managed_mode/managed_mode_url_filter.h2
-rw-r--r--chrome/browser/metrics/variations/resource_request_allowed_notifier.h2
-rw-r--r--chrome/browser/policy/user_info_fetcher.h2
-rw-r--r--chrome/browser/profiles/profile.h2
-rw-r--r--chrome/browser/signin/about_signin_internals.h2
-rw-r--r--chrome/browser/signin/signin_internals_util.h3
-rw-r--r--chrome/browser/signin/signin_tracker.h2
-rw-r--r--chrome/browser/spellchecker/spellcheck_custom_dictionary.h2
-rw-r--r--chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h2
-rw-r--r--chrome/browser/tab_contents/render_view_context_menu.h2
-rw-r--r--chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h2
-rw-r--r--chrome/browser/ui/autofill/autofill_popup_delegate.h2
-rw-r--r--chrome/browser/ui/base_window.h2
-rw-r--r--chrome/browser/ui/gtk/avatar_menu_item_gtk.h2
-rw-r--r--chrome/browser/ui/panels/display_settings_provider.h6
-rw-r--r--chrome/browser/ui/website_settings/permission_menu_model.h2
-rw-r--r--chrome/utility/chrome_content_utility_client.h2
-rw-r--r--content/browser/download/download_item_impl.h2
-rw-r--r--content/public/browser/download_destination_observer.h2
-rw-r--r--content/public/utility/content_utility_client.h2
-rw-r--r--dbus/property.h1
-rw-r--r--ipc/ipc_channel_proxy.h2
-rw-r--r--media/audio/audio_manager.h2
-rw-r--r--media/filters/ffmpeg_glue.h2
-rw-r--r--net/http/http_pipelined_connection.h2
-rw-r--r--net/http/http_pipelined_host.h2
-rw-r--r--net/http/http_pipelined_host_forced.h2
-rw-r--r--net/http/http_pipelined_host_impl.h2
-rw-r--r--net/http/http_pipelined_host_pool.h4
-rw-r--r--net/http/http_stream_factory_impl.h2
56 files changed, 15 insertions, 119 deletions
diff --git a/ash/wm/system_modal_container_event_filter_delegate.h b/ash/wm/system_modal_container_event_filter_delegate.h
index 0664382..4e27d00 100644
--- a/ash/wm/system_modal_container_event_filter_delegate.h
+++ b/ash/wm/system_modal_container_event_filter_delegate.h
@@ -16,8 +16,6 @@ namespace internal {
class ASH_EXPORT SystemModalContainerEventFilterDelegate {
public:
- virtual ~SystemModalContainerEventFilterDelegate() { }
-
// Returns true if |window| can receive the specified event.
virtual bool CanWindowReceiveEvents(aura::Window* window) = 0;
};
diff --git a/base/debug/trace_event_impl.h b/base/debug/trace_event_impl.h
index f405e00..58a44da 100644
--- a/base/debug/trace_event_impl.h
+++ b/base/debug/trace_event_impl.h
@@ -217,8 +217,6 @@ class BASE_EXPORT TraceLog {
// on-demand.
class EnabledStateChangedObserver {
public:
- virtual ~EnabledStateChangedObserver() { }
-
// Called just before the tracing system becomes
// enabled. TraceLog::IsEnabled will return false at this point and trace
// macros and methods called within the observer will deadlock.
diff --git a/base/prefs/pref_observer.h b/base/prefs/pref_observer.h
index 3f86f52..93a0454 100644
--- a/base/prefs/pref_observer.h
+++ b/base/prefs/pref_observer.h
@@ -12,8 +12,6 @@ class PrefServiceBase;
// TODO(joi): Switch to base::Callback and remove this.
class PrefObserver {
public:
- virtual ~PrefObserver() { }
-
virtual void OnPreferenceChanged(PrefServiceBase* service,
const std::string& pref_name) = 0;
};
diff --git a/base/prefs/public/pref_change_registrar.h b/base/prefs/public/pref_change_registrar.h
index 6d93e5e..84df652 100644
--- a/base/prefs/public/pref_change_registrar.h
+++ b/base/prefs/public/pref_change_registrar.h
@@ -19,8 +19,7 @@ class PrefServiceBase;
// with a PrefStore. Functions much like NotificationRegistrar, but specifically
// manages observers of preference changes. When the Registrar is destroyed,
// all registered observers are automatically unregistered with the PrefStore.
-class BASE_PREFS_EXPORT PrefChangeRegistrar
- : public NON_EXPORTED_BASE(PrefObserver) {
+class BASE_PREFS_EXPORT PrefChangeRegistrar : public PrefObserver {
public:
// You can register this type of callback if you need to know the
// path of the preference that is changing.
diff --git a/base/prefs/public/pref_member.h b/base/prefs/public/pref_member.h
index a395ab1..52a91b5 100644
--- a/base/prefs/public/pref_member.h
+++ b/base/prefs/public/pref_member.h
@@ -42,8 +42,7 @@ class PrefServiceBase;
namespace subtle {
-class BASE_PREFS_EXPORT PrefMemberBase
- : public NON_EXPORTED_BASE(PrefObserver) {
+class BASE_PREFS_EXPORT PrefMemberBase : public PrefObserver {
public:
// Type of callback you can register if you need to know the name of
// the pref that is changing.
diff --git a/base/threading/post_task_and_reply_impl.h b/base/threading/post_task_and_reply_impl.h
index cf7ba39..076a46d 100644
--- a/base/threading/post_task_and_reply_impl.h
+++ b/base/threading/post_task_and_reply_impl.h
@@ -25,8 +25,6 @@ namespace internal {
// may want base::WorkerPool.
class PostTaskAndReplyImpl {
public:
- virtual ~PostTaskAndReplyImpl() { }
-
// Implementation for MessageLoopProxy::PostTaskAndReply and
// WorkerPool::PostTaskAndReply.
bool PostTaskAndReply(const tracked_objects::Location& from_here,
diff --git a/cc/layer_animation_event_observer.h b/cc/layer_animation_event_observer.h
index 38bf29a..a66d026 100644
--- a/cc/layer_animation_event_observer.h
+++ b/cc/layer_animation_event_observer.h
@@ -10,9 +10,6 @@ namespace cc {
class CC_EXPORT LayerAnimationEventObserver {
public:
virtual void OnAnimationStarted(const AnimationEvent& event) = 0;
-
- protected:
- virtual ~LayerAnimationEventObserver() { }
};
} // namespace cc
diff --git a/cc/layer_tree_host.h b/cc/layer_tree_host.h
index a693070..a45c1c1 100644
--- a/cc/layer_tree_host.h
+++ b/cc/layer_tree_host.h
@@ -72,7 +72,7 @@ struct CC_EXPORT RendererCapabilities {
int maxTextureSize;
};
-class CC_EXPORT LayerTreeHost : public NON_EXPORTED_BASE(RateLimiterClient) {
+class CC_EXPORT LayerTreeHost : public RateLimiterClient {
public:
static scoped_ptr<LayerTreeHost> create(LayerTreeHostClient*, const LayerTreeSettings&, scoped_ptr<Thread> implThread);
virtual ~LayerTreeHost();
@@ -218,7 +218,7 @@ private:
void updateLayers(Layer*, ResourceUpdateQueue&);
void triggerPrepaint();
- void prioritizeTextures(const LayerList&, OverdrawMetrics&);
+ void prioritizeTextures(const LayerList&, OverdrawMetrics&);
void setPrioritiesForSurfaces(size_t surfaceMemoryBytes);
void setPrioritiesForLayers(const LayerList&);
size_t calculateMemoryForRenderSurfaces(const LayerList& updateList);
diff --git a/cc/layer_tree_host_impl.h b/cc/layer_tree_host_impl.h
index 98368f3..aff251b 100644
--- a/cc/layer_tree_host_impl.h
+++ b/cc/layer_tree_host_impl.h
@@ -59,9 +59,6 @@ public:
virtual void sendManagedMemoryStats() = 0;
virtual bool isInsideDraw() = 0;
virtual void renewTreePriority() = 0;
-
-protected:
- virtual ~LayerTreeHostImplClient() { }
};
// LayerTreeHostImpl owns the LayerImpl tree as well as associated rendering state
@@ -95,7 +92,7 @@ public:
struct CC_EXPORT FrameData : public RenderPassSink {
FrameData();
- virtual ~FrameData();
+ ~FrameData();
std::vector<gfx::Rect> occludingScreenSpaceRects;
std::vector<gfx::Rect> nonOccludingScreenSpaceRects;
diff --git a/cc/picture_layer_impl.h b/cc/picture_layer_impl.h
index 72df41e..cc511a1 100644
--- a/cc/picture_layer_impl.h
+++ b/cc/picture_layer_impl.h
@@ -18,9 +18,8 @@ namespace cc {
struct AppendQuadsData;
class QuadSink;
-class CC_EXPORT PictureLayerImpl
- : public LayerImpl,
- public NON_EXPORTED_BASE(PictureLayerTilingClient) {
+class CC_EXPORT PictureLayerImpl : public LayerImpl,
+ public PictureLayerTilingClient {
public:
static scoped_ptr<PictureLayerImpl> create(LayerTreeImpl* treeImpl, int id)
{
diff --git a/cc/picture_layer_tiling.h b/cc/picture_layer_tiling.h
index 7558332..58883af 100644
--- a/cc/picture_layer_tiling.h
+++ b/cc/picture_layer_tiling.h
@@ -31,9 +31,6 @@ class PictureLayerTilingClient {
virtual gfx::Size CalculateTileSize(
gfx::Size current_tile_size,
gfx::Size content_bounds) = 0;
-
- protected:
- virtual ~PictureLayerTilingClient() { }
};
class CC_EXPORT PictureLayerTiling {
diff --git a/cc/rate_limiter.h b/cc/rate_limiter.h
index 6a86dfc..df7850d 100644
--- a/cc/rate_limiter.h
+++ b/cc/rate_limiter.h
@@ -18,9 +18,6 @@ class Thread;
class RateLimiterClient {
public:
virtual void rateLimit() = 0;
-
-protected:
- virtual ~RateLimiterClient() { }
};
// A RateLimiter can be used to make sure that a single context does not dominate all execution time.
diff --git a/cc/video_frame_provider.h b/cc/video_frame_provider.h
index 24e37d5..8dd85f5 100644
--- a/cc/video_frame_provider.h
+++ b/cc/video_frame_provider.h
@@ -35,9 +35,6 @@ class VideoFrameProvider {
// Notifies the provider's client of a new UV transform matrix to be used.
virtual void DidUpdateMatrix(const float*) = 0;
-
- protected:
- virtual ~Client() { }
};
// May be called from any thread, but there must be some external guarantee
diff --git a/chrome/browser/certificate_manager_model.h b/chrome/browser/certificate_manager_model.h
index 4654c33..6e21f67 100644
--- a/chrome/browser/certificate_manager_model.h
+++ b/chrome/browser/certificate_manager_model.h
@@ -31,8 +31,6 @@ class CertificateManagerModel {
class Observer {
public:
- virtual ~Observer() { }
-
// Called to notify the view that the certificate list has been refreshed.
// TODO(mattm): do a more granular updating strategy? Maybe retrieve new
// list of certs, diff against past list, and then notify of the changes?
diff --git a/chrome/browser/download/download_danger_prompt.h b/chrome/browser/download/download_danger_prompt.h
index 859f63a..2ab5bb0 100644
--- a/chrome/browser/download/download_danger_prompt.h
+++ b/chrome/browser/download/download_danger_prompt.h
@@ -27,8 +27,6 @@ class DownloadDangerPrompt {
CANCEL
};
- virtual ~DownloadDangerPrompt() { }
-
// Return a new self-deleting DownloadDangerPrompt. |accepted| or |canceled|
// will be run when the the respective action is invoked. |canceled| may also
// be called when |item| is either no longer dangerous or no longer in
diff --git a/chrome/browser/extensions/activity_log.h b/chrome/browser/extensions/activity_log.h
index ba928c6..c2f7c24 100644
--- a/chrome/browser/extensions/activity_log.h
+++ b/chrome/browser/extensions/activity_log.h
@@ -43,8 +43,6 @@ class ActivityLog : public ProfileKeyedService,
// Observers can listen for activity events.
class Observer {
public:
- virtual ~Observer() { }
-
virtual void OnExtensionActivity(
const Extension* extension,
Activity activity,
diff --git a/chrome/browser/extensions/api/developer_private/entry_picker.h b/chrome/browser/extensions/api/developer_private/entry_picker.h
index 5cb05e8..b2025f7 100644
--- a/chrome/browser/extensions/api/developer_private/entry_picker.h
+++ b/chrome/browser/extensions/api/developer_private/entry_picker.h
@@ -18,8 +18,6 @@ namespace api {
class EntryPickerClient {
public:
- virtual ~EntryPickerClient() { }
-
virtual void FileSelected(const FilePath& path) = 0;
virtual void FileSelectionCanceled() = 0;
};
diff --git a/chrome/browser/extensions/api/page_capture/page_capture_api.h b/chrome/browser/extensions/api/page_capture/page_capture_api.h
index 8f04d08..e2d6ac4 100644
--- a/chrome/browser/extensions/api/page_capture/page_capture_api.h
+++ b/chrome/browser/extensions/api/page_capture/page_capture_api.h
@@ -29,8 +29,6 @@ class PageCaptureSaveAsMHTMLFunction : public AsyncExtensionFunction {
// Test specific delegate used to test that the temporary file gets deleted.
class TestDelegate {
public:
- virtual ~TestDelegate() { }
-
// Called on the UI thread when the temporary file that contains the
// generated data has been created.
virtual void OnTemporaryFileCreated(const base::FilePath& temp_file) = 0;
diff --git a/chrome/browser/extensions/app_notify_channel_setup.h b/chrome/browser/extensions/app_notify_channel_setup.h
index a0388e5..a43e08b 100644
--- a/chrome/browser/extensions/app_notify_channel_setup.h
+++ b/chrome/browser/extensions/app_notify_channel_setup.h
@@ -51,8 +51,6 @@ class AppNotifyChannelSetup
class Delegate {
public:
- virtual ~Delegate() { }
-
// If successful, |channel_id| will be non-empty. On failure, |channel_id|
// will be empty and |error| will contain an error to report to the JS
// callback.
@@ -66,8 +64,6 @@ class AppNotifyChannelSetup
// forcing the return of a certain result to the delegate.
class InterceptorForTests {
public:
- virtual ~InterceptorForTests() { }
-
virtual void DoIntercept(
const AppNotifyChannelSetup* setup,
std::string* result_channel_id,
diff --git a/chrome/browser/extensions/event_router.h b/chrome/browser/extensions/event_router.h
index 66c1509..a7e76b0 100644
--- a/chrome/browser/extensions/event_router.h
+++ b/chrome/browser/extensions/event_router.h
@@ -54,8 +54,6 @@ class EventRouter : public content::NotificationObserver,
// notified when a listener is added or removed for that |event_name|.
class Observer {
public:
- virtual ~Observer() {}
-
// Called when a listener is added.
virtual void OnListenerAdded(const EventListenerInfo& details) {}
// Called when a listener is removed.
diff --git a/chrome/browser/extensions/extension_function.h b/chrome/browser/extensions/extension_function.h
index 6f45708..86cce8c 100644
--- a/chrome/browser/extensions/extension_function.h
+++ b/chrome/browser/extensions/extension_function.h
@@ -266,8 +266,6 @@ class UIThreadExtensionFunction : public ExtensionFunction {
// A delegate for use in testing, to intercept the call to SendResponse.
class DelegateForTests {
public:
- virtual ~DelegateForTests() { }
-
virtual void OnSendResponse(UIThreadExtensionFunction* function,
bool success,
bool bad_message) = 0;
diff --git a/chrome/browser/extensions/extension_keybinding_registry.h b/chrome/browser/extensions/extension_keybinding_registry.h
index 0664421..7acd7f5 100644
--- a/chrome/browser/extensions/extension_keybinding_registry.h
+++ b/chrome/browser/extensions/extension_keybinding_registry.h
@@ -32,8 +32,6 @@ class ExtensionKeybindingRegistry : public content::NotificationObserver {
class Delegate {
public:
- virtual ~Delegate() { }
-
// Gets the ActiveTabPermissionGranter for the active tab, if any.
// If there is no active tab then returns NULL.
virtual ActiveTabPermissionGranter* GetActiveTabPermissionGranter() = 0;
diff --git a/chrome/browser/extensions/extension_scoped_prefs.h b/chrome/browser/extensions/extension_scoped_prefs.h
index 7930290..0989f14 100644
--- a/chrome/browser/extensions/extension_scoped_prefs.h
+++ b/chrome/browser/extensions/extension_scoped_prefs.h
@@ -8,7 +8,7 @@
class ExtensionScopedPrefs {
public:
ExtensionScopedPrefs() {}
- virtual ~ExtensionScopedPrefs() {}
+ ~ExtensionScopedPrefs() {}
// Sets the pref |key| for extension |id| to |value|.
virtual void UpdateExtensionPref(const std::string& id,
diff --git a/chrome/browser/extensions/extension_warning_service.h b/chrome/browser/extensions/extension_warning_service.h
index fad857e..03e8499 100644
--- a/chrome/browser/extensions/extension_warning_service.h
+++ b/chrome/browser/extensions/extension_warning_service.h
@@ -36,8 +36,6 @@ class ExtensionWarningService : public content::NotificationObserver,
public:
class Observer {
public:
- virtual ~Observer() { }
-
virtual void ExtensionWarningsChanged() = 0;
};
diff --git a/chrome/browser/favicon/favicon_handler_delegate.h b/chrome/browser/favicon/favicon_handler_delegate.h
index e1df43b..db13345a 100644
--- a/chrome/browser/favicon/favicon_handler_delegate.h
+++ b/chrome/browser/favicon/favicon_handler_delegate.h
@@ -16,8 +16,6 @@ class NavigationEntry;
// about changes.
class FaviconHandlerDelegate {
public:
- virtual ~FaviconHandlerDelegate() { }
-
// Returns the current NavigationEntry.
virtual content::NavigationEntry* GetActiveEntry() = 0;
diff --git a/chrome/browser/google_apis/auth_service_interface.h b/chrome/browser/google_apis/auth_service_interface.h
index dd15c05..14e3e2eb 100644
--- a/chrome/browser/google_apis/auth_service_interface.h
+++ b/chrome/browser/google_apis/auth_service_interface.h
@@ -27,8 +27,6 @@ typedef base::Callback<void(GDataErrorCode error,
// All functions must be called on UI thread.
class AuthServiceInterface {
public:
- virtual ~AuthServiceInterface() { }
-
// Adds and removes the observer. AddObserver() should be called before
// Initialize() as it can change the refresh token.
virtual void AddObserver(AuthServiceObserver* observer) = 0;
diff --git a/chrome/browser/managed_mode/managed_mode_url_filter.h b/chrome/browser/managed_mode/managed_mode_url_filter.h
index 98cfd3e..2059cb4 100644
--- a/chrome/browser/managed_mode/managed_mode_url_filter.h
+++ b/chrome/browser/managed_mode/managed_mode_url_filter.h
@@ -39,8 +39,6 @@ class ManagedModeURLFilter
class Observer {
public:
- virtual ~Observer() { }
-
virtual void OnSiteListUpdated() = 0;
};
diff --git a/chrome/browser/metrics/variations/resource_request_allowed_notifier.h b/chrome/browser/metrics/variations/resource_request_allowed_notifier.h
index 6c3db96..6a7241e 100644
--- a/chrome/browser/metrics/variations/resource_request_allowed_notifier.h
+++ b/chrome/browser/metrics/variations/resource_request_allowed_notifier.h
@@ -41,8 +41,6 @@ class ResourceRequestAllowedNotifier :
// Observes resource request allowed state changes.
class Observer {
public:
- virtual ~Observer() { }
-
virtual void OnResourceRequestsAllowed() = 0;
};
diff --git a/chrome/browser/policy/user_info_fetcher.h b/chrome/browser/policy/user_info_fetcher.h
index 4257a47..a6e7982 100644
--- a/chrome/browser/policy/user_info_fetcher.h
+++ b/chrome/browser/policy/user_info_fetcher.h
@@ -28,8 +28,6 @@ class UserInfoFetcher : public net::URLFetcherDelegate {
public:
class Delegate {
public:
- virtual ~Delegate() { }
-
// Invoked when the UserInfo request has succeeded, passing the parsed
// response in |response|. Delegate may free the UserInfoFetcher in this
// callback.
diff --git a/chrome/browser/profiles/profile.h b/chrome/browser/profiles/profile.h
index 65eb0c9..40ca85d 100644
--- a/chrome/browser/profiles/profile.h
+++ b/chrome/browser/profiles/profile.h
@@ -121,8 +121,6 @@ class Profile : public content::BrowserContext {
class Delegate {
public:
- virtual ~Delegate() {}
-
// Called when creation of the profile is finished.
virtual void OnProfileCreated(Profile* profile,
bool success,
diff --git a/chrome/browser/signin/about_signin_internals.h b/chrome/browser/signin/about_signin_internals.h
index ca405d4..ece1b2d 100644
--- a/chrome/browser/signin/about_signin_internals.h
+++ b/chrome/browser/signin/about_signin_internals.h
@@ -27,8 +27,6 @@ class AboutSigninInternals
public:
class Observer {
public:
- virtual ~Observer() { }
-
// |info| will contain the dictionary of signin_status_ values as indicated
// in the comments for GetSigninStatus() below.
virtual void OnSigninStateChanged(scoped_ptr<DictionaryValue> info) = 0;
diff --git a/chrome/browser/signin/signin_internals_util.h b/chrome/browser/signin/signin_internals_util.h
index b176f92..9930c96 100644
--- a/chrome/browser/signin/signin_internals_util.h
+++ b/chrome/browser/signin/signin_internals_util.h
@@ -125,8 +125,6 @@ struct SigninStatus {
// An Observer class for authentication and token diagnostic information.
class SigninDiagnosticsObserver {
public:
- virtual ~SigninDiagnosticsObserver() {}
-
// Credentials and signin related changes.
virtual void NotifySigninValueChanged(const UntimedSigninStatusField& field,
const std::string& value) {}
@@ -140,6 +138,7 @@ class SigninDiagnosticsObserver {
virtual void NotifyTokenReceivedFailure(const std::string& token_name,
const std::string& error) {}
virtual void NotifyClearStoredToken(const std::string& token_name) {}
+
};
} // namespace
diff --git a/chrome/browser/signin/signin_tracker.h b/chrome/browser/signin/signin_tracker.h
index 9022710..54105ae 100644
--- a/chrome/browser/signin/signin_tracker.h
+++ b/chrome/browser/signin/signin_tracker.h
@@ -52,8 +52,6 @@ class SigninTracker : public ProfileSyncServiceObserver,
public:
class Observer {
public:
- virtual ~Observer() { }
-
// The GAIA credentials entered by the user have been validated.
virtual void GaiaCredentialsValid() = 0;
diff --git a/chrome/browser/spellchecker/spellcheck_custom_dictionary.h b/chrome/browser/spellchecker/spellcheck_custom_dictionary.h
index 1a514c0..9d55a64 100644
--- a/chrome/browser/spellchecker/spellcheck_custom_dictionary.h
+++ b/chrome/browser/spellchecker/spellcheck_custom_dictionary.h
@@ -67,8 +67,6 @@ class SpellcheckCustomDictionary : public SpellcheckDictionary,
// Interface to implement for dictionary load and change observers.
class Observer {
public:
- virtual ~Observer() { }
-
// Called when the custom dictionary has been loaded.
virtual void OnCustomDictionaryLoaded() = 0;
diff --git a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h
index ce190c3..b41b76d 100644
--- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h
+++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h
@@ -31,8 +31,6 @@ class SpellcheckHunspellDictionary
// Interface to implement for observers of the Hunspell dictionary.
class Observer {
public:
- virtual ~Observer() { }
-
// The dictionary has been initialized.
virtual void OnHunspellDictionaryInitialized() = 0;
diff --git a/chrome/browser/tab_contents/render_view_context_menu.h b/chrome/browser/tab_contents/render_view_context_menu.h
index 92fa627..a44e4b8 100644
--- a/chrome/browser/tab_contents/render_view_context_menu.h
+++ b/chrome/browser/tab_contents/render_view_context_menu.h
@@ -103,8 +103,6 @@ struct WebPluginAction;
//
class RenderViewContextMenuProxy {
public:
- virtual ~RenderViewContextMenuProxy() { }
-
// Add a menu item to a context menu.
virtual void AddMenuItem(int command_id, const string16& title) = 0;
virtual void AddCheckItem(int command_id, const string16& title) = 0;
diff --git a/chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h b/chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h
index f6083cb..6fe82f8 100644
--- a/chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h
+++ b/chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h
@@ -11,8 +11,6 @@ class JavaScriptAppModalDialog;
class NativeAppModalDialog {
public:
- virtual ~NativeAppModalDialog() { }
-
// Returns the buttons to be shown. See ui::DialogButton for which buttons can
// be returned.
virtual int GetAppModalDialogButtons() const = 0;
diff --git a/chrome/browser/ui/autofill/autofill_popup_delegate.h b/chrome/browser/ui/autofill/autofill_popup_delegate.h
index a8d6cc1..c419f3f 100644
--- a/chrome/browser/ui/autofill/autofill_popup_delegate.h
+++ b/chrome/browser/ui/autofill/autofill_popup_delegate.h
@@ -11,8 +11,6 @@
// of events by the controller.
class AutofillPopupDelegate {
public:
- virtual ~AutofillPopupDelegate() { }
-
// Called when the autofill suggestion indicated by |identifier| has been
// temporarily selected (e.g., hovered).
virtual void DidSelectSuggestion(int identifier) = 0;
diff --git a/chrome/browser/ui/base_window.h b/chrome/browser/ui/base_window.h
index 52b0807..deaa700 100644
--- a/chrome/browser/ui/base_window.h
+++ b/chrome/browser/ui/base_window.h
@@ -19,8 +19,6 @@ class SkRegion;
class BaseWindow {
public:
- virtual ~BaseWindow() { }
-
// Returns true if the window is currently the active/focused window.
virtual bool IsActive() const = 0;
diff --git a/chrome/browser/ui/gtk/avatar_menu_item_gtk.h b/chrome/browser/ui/gtk/avatar_menu_item_gtk.h
index 5b05e7ca..5fe6655 100644
--- a/chrome/browser/ui/gtk/avatar_menu_item_gtk.h
+++ b/chrome/browser/ui/gtk/avatar_menu_item_gtk.h
@@ -24,8 +24,6 @@ class AvatarMenuItemGtk : public content::NotificationObserver {
// Delegates opening or editing a profile.
class Delegate {
public:
- virtual ~Delegate() { }
-
// Open a new browser window using the profile at |profile_index|.
virtual void OpenProfile(size_t profile_index) = 0;
diff --git a/chrome/browser/ui/panels/display_settings_provider.h b/chrome/browser/ui/panels/display_settings_provider.h
index bad4502..61a7a99 100644
--- a/chrome/browser/ui/panels/display_settings_provider.h
+++ b/chrome/browser/ui/panels/display_settings_provider.h
@@ -32,23 +32,17 @@ class DisplaySettingsProvider {
class DisplayAreaObserver {
public:
- virtual ~DisplayAreaObserver() { }
-
virtual void OnDisplayAreaChanged(const gfx::Rect& display_area) = 0;
};
class DesktopBarObserver {
public:
- virtual ~DesktopBarObserver() { }
-
virtual void OnAutoHidingDesktopBarVisibilityChanged(
DesktopBarAlignment alignment, DesktopBarVisibility visibility) = 0;
};
class FullScreenObserver {
public:
- virtual ~FullScreenObserver() { }
-
virtual void OnFullScreenModeChanged(bool is_full_screen) = 0;
};
diff --git a/chrome/browser/ui/website_settings/permission_menu_model.h b/chrome/browser/ui/website_settings/permission_menu_model.h
index 162f127..0abe7a2 100644
--- a/chrome/browser/ui/website_settings/permission_menu_model.h
+++ b/chrome/browser/ui/website_settings/permission_menu_model.h
@@ -21,8 +21,6 @@ class PermissionMenuModel : public ui::SimpleMenuModel,
class Delegate {
public:
- virtual ~Delegate() { }
-
// Executes the command with the given |command_id|.
virtual void ExecuteCommand(int command_id) = 0;
// Returns true if the command with the given |command_id| should be
diff --git a/chrome/utility/chrome_content_utility_client.h b/chrome/utility/chrome_content_utility_client.h
index fc7cad2..b28b86e 100644
--- a/chrome/utility/chrome_content_utility_client.h
+++ b/chrome/utility/chrome_content_utility_client.h
@@ -39,7 +39,7 @@ class ProfileImportHandler;
class ChromeContentUtilityClient : public content::ContentUtilityClient {
public:
ChromeContentUtilityClient();
- virtual ~ChromeContentUtilityClient();
+ ~ChromeContentUtilityClient();
virtual void UtilityThreadStarted() OVERRIDE;
virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
diff --git a/content/browser/download/download_item_impl.h b/content/browser/download/download_item_impl.h
index 7c41719..c0756d6 100644
--- a/content/browser/download/download_item_impl.h
+++ b/content/browser/download/download_item_impl.h
@@ -32,7 +32,7 @@ class DownloadItemImplDelegate;
// See download_item.h for usage.
class CONTENT_EXPORT DownloadItemImpl
: public DownloadItem,
- public NON_EXPORTED_BASE(DownloadDestinationObserver) {
+ public DownloadDestinationObserver {
public:
enum ResumeMode {
RESUME_MODE_INVALID = 0,
diff --git a/content/public/browser/download_destination_observer.h b/content/public/browser/download_destination_observer.h
index 0dd784f..dbe6cce 100644
--- a/content/public/browser/download_destination_observer.h
+++ b/content/public/browser/download_destination_observer.h
@@ -23,8 +23,6 @@ namespace content {
// Note that this interface does not deal with cross-thread lifetime issues.
class DownloadDestinationObserver {
public:
- virtual ~DownloadDestinationObserver() { }
-
virtual void DestinationUpdate(int64 bytes_so_far,
int64 bytes_per_sec,
const std::string& hash_state) = 0;
diff --git a/content/public/utility/content_utility_client.h b/content/public/utility/content_utility_client.h
index 5a5d0e5..8f1ec4c 100644
--- a/content/public/utility/content_utility_client.h
+++ b/content/public/utility/content_utility_client.h
@@ -12,8 +12,6 @@ namespace content {
// Embedder API for participating in renderer logic.
class CONTENT_EXPORT ContentUtilityClient {
public:
- virtual ~ContentUtilityClient() {}
-
// Notifies us that the UtilityThread has been created.
virtual void UtilityThreadStarted() {}
diff --git a/dbus/property.h b/dbus/property.h
index 6570674..f2feb05 100644
--- a/dbus/property.h
+++ b/dbus/property.h
@@ -133,7 +133,6 @@ class PropertySet;
class PropertyBase {
public:
PropertyBase() : property_set_(NULL) {}
- virtual ~PropertyBase() {}
// Initializes the |property_set| and property |name| so that method
// calls may be made from this class. This method is called by
diff --git a/ipc/ipc_channel_proxy.h b/ipc/ipc_channel_proxy.h
index 8ea6734..e4cd83a 100644
--- a/ipc/ipc_channel_proxy.h
+++ b/ipc/ipc_channel_proxy.h
@@ -113,8 +113,6 @@ class IPC_EXPORT ChannelProxy : public Sender, public base::NonThreadSafe {
// re-write the message. Used mainly for testing.
class OutgoingMessageFilter {
public:
- virtual ~OutgoingMessageFilter() { }
-
// Returns a re-written message, freeing the original, or simply the
// original unchanged if no rewrite indicated.
virtual Message *Rewrite(Message *message) = 0;
diff --git a/media/audio/audio_manager.h b/media/audio/audio_manager.h
index 3bb98d9..ca4c468 100644
--- a/media/audio/audio_manager.h
+++ b/media/audio/audio_manager.h
@@ -117,8 +117,6 @@ class MEDIA_EXPORT AudioManager {
// callback is to recreate the stream.
class AudioDeviceListener {
public:
- virtual ~AudioDeviceListener() { }
-
virtual void OnDeviceChange() = 0;
};
diff --git a/media/filters/ffmpeg_glue.h b/media/filters/ffmpeg_glue.h
index e6987b0..17241b9 100644
--- a/media/filters/ffmpeg_glue.h
+++ b/media/filters/ffmpeg_glue.h
@@ -38,8 +38,6 @@ class ScopedPtrAVFree;
class MEDIA_EXPORT FFmpegURLProtocol {
public:
- virtual ~FFmpegURLProtocol() { }
-
// Read the given amount of bytes into data, returns the number of bytes read
// if successful, kReadError otherwise.
virtual int Read(int size, uint8* data) = 0;
diff --git a/net/http/http_pipelined_connection.h b/net/http/http_pipelined_connection.h
index 2f856b0..d0d3599 100644
--- a/net/http/http_pipelined_connection.h
+++ b/net/http/http_pipelined_connection.h
@@ -30,8 +30,6 @@ class NET_EXPORT_PRIVATE HttpPipelinedConnection {
class Delegate {
public:
- virtual ~Delegate() {}
-
// Called when a pipeline has newly available capacity. This may be because
// the first request has been sent and the pipeline is now active. Or, it
// may be because a request successfully completed.
diff --git a/net/http/http_pipelined_host.h b/net/http/http_pipelined_host.h
index bb5ce4d..b7732e6 100644
--- a/net/http/http_pipelined_host.h
+++ b/net/http/http_pipelined_host.h
@@ -43,8 +43,6 @@ class NET_EXPORT_PRIVATE HttpPipelinedHost {
class Delegate {
public:
- virtual ~Delegate() {}
-
// Called when a pipelined host has no outstanding requests on any of its
// pipelined connections.
virtual void OnHostIdle(HttpPipelinedHost* host) = 0;
diff --git a/net/http/http_pipelined_host_forced.h b/net/http/http_pipelined_host_forced.h
index 94a27f0..2c3c915 100644
--- a/net/http/http_pipelined_host_forced.h
+++ b/net/http/http_pipelined_host_forced.h
@@ -32,7 +32,7 @@ struct SSLConfig;
// test the user's connection for pipelining compatibility.
class NET_EXPORT_PRIVATE HttpPipelinedHostForced
: public HttpPipelinedHost,
- public NON_EXPORTED_BASE(HttpPipelinedConnection::Delegate) {
+ public HttpPipelinedConnection::Delegate {
public:
HttpPipelinedHostForced(HttpPipelinedHost::Delegate* delegate,
const Key& key,
diff --git a/net/http/http_pipelined_host_impl.h b/net/http/http_pipelined_host_impl.h
index 9b7a1c7..e2e53c9 100644
--- a/net/http/http_pipelined_host_impl.h
+++ b/net/http/http_pipelined_host_impl.h
@@ -33,7 +33,7 @@ struct SSLConfig;
// assigns requests to the least loaded pipelined connection.
class NET_EXPORT_PRIVATE HttpPipelinedHostImpl
: public HttpPipelinedHost,
- public NON_EXPORTED_BASE(HttpPipelinedConnection::Delegate) {
+ public HttpPipelinedConnection::Delegate {
public:
HttpPipelinedHostImpl(HttpPipelinedHost::Delegate* delegate,
const HttpPipelinedHost::Key& key,
diff --git a/net/http/http_pipelined_host_pool.h b/net/http/http_pipelined_host_pool.h
index d729325..3ab9418 100644
--- a/net/http/http_pipelined_host_pool.h
+++ b/net/http/http_pipelined_host_pool.h
@@ -27,12 +27,10 @@ class HttpServerProperties;
// HTTP requests. Manages connection jobs, constructs pipelined streams, and
// assigns requests to the least loaded pipelined connection.
class NET_EXPORT_PRIVATE HttpPipelinedHostPool
- : public NON_EXPORTED_BASE(HttpPipelinedHost::Delegate) {
+ : public HttpPipelinedHost::Delegate {
public:
class Delegate {
public:
- virtual ~Delegate() {}
-
// Called when a HttpPipelinedHost has new capacity. Attempts to allocate
// any pending pipeline-capable requests to pipelines.
virtual void OnHttpPipelinedHostHasAdditionalCapacity(
diff --git a/net/http/http_stream_factory_impl.h b/net/http/http_stream_factory_impl.h
index 5918981..213d96a 100644
--- a/net/http/http_stream_factory_impl.h
+++ b/net/http/http_stream_factory_impl.h
@@ -25,7 +25,7 @@ class SpdySession;
class NET_EXPORT_PRIVATE HttpStreamFactoryImpl :
public HttpStreamFactory,
- public NON_EXPORTED_BASE(HttpPipelinedHostPool::Delegate) {
+ public HttpPipelinedHostPool::Delegate {
public:
explicit HttpStreamFactoryImpl(HttpNetworkSession* session);
virtual ~HttpStreamFactoryImpl();