diff options
author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-28 20:41:10 +0000 |
---|---|---|
committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-28 20:41:10 +0000 |
commit | be952c3ca6d93968409b246c9439a7d8c2a06bba (patch) | |
tree | 501d38ada79c1fddf10f65fe6c88b27a3df4cb1d /chrome/browser/renderer_host | |
parent | 86c008e8a7da9c00c5a676eb201ba5d0c976748e (diff) | |
download | chromium_src-be952c3ca6d93968409b246c9439a7d8c2a06bba.zip chromium_src-be952c3ca6d93968409b246c9439a7d8c2a06bba.tar.gz chromium_src-be952c3ca6d93968409b246c9439a7d8c2a06bba.tar.bz2 |
Fix a ton of compiler warnings.
Most of these are classes with virtual methods lacking virtual destructors
or NULL used in non-pointer context.
BUG=none
TEST=app_unittests && base_unittests
--gtest_filter=-ConditionVariableTest.LargeFastTaskTest
patch by Jacob Mandelson <jlmjlm [at] gmail>
http://codereview.chromium.org/171028/show
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24792 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host')
4 files changed, 34 insertions, 4 deletions
diff --git a/chrome/browser/renderer_host/render_view_host_delegate.h b/chrome/browser/renderer_host/render_view_host_delegate.h index 2727879..916ff9db 100644 --- a/chrome/browser/renderer_host/render_view_host_delegate.h +++ b/chrome/browser/renderer_host/render_view_host_delegate.h @@ -136,6 +136,9 @@ class RenderViewHostDelegate { // The content's intrinsic width (prefWidth) changed. virtual void UpdatePreferredWidth(int pref_width) = 0; + + protected: + ~View() {} }; // RendererManagerment ------------------------------------------------------- @@ -161,6 +164,9 @@ class RenderViewHostDelegate { // Called the ResourceDispatcherHost's associate CrossSiteRequestHandler // when a cross-site navigation has been canceled. virtual void OnCrossSiteNavigationCanceled() = 0; + + protected: + ~RendererManagement() {} }; // BrowserIntegration -------------------------------------------------------- @@ -207,6 +213,9 @@ class RenderViewHostDelegate { virtual void OnDidGetApplicationInfo( int32 page_id, const webkit_glue::WebApplicationInfo& app_info) = 0; + + protected: + ~BrowserIntegration() {} }; // Resource ------------------------------------------------------------------ @@ -263,6 +272,9 @@ class RenderViewHostDelegate { // Notification that a document has been loaded in a frame. virtual void DocumentLoadedInFrame() = 0; + + protected: + ~Resource() {} }; // Save ---------------------------------------------------------------------- @@ -288,6 +300,9 @@ class RenderViewHostDelegate { virtual void OnReceivedSerializedHtmlData(const GURL& frame_url, const std::string& data, int32 status) = 0; + + protected: + ~Save() {} }; // Printing ------------------------------------------------------------------ @@ -303,6 +318,9 @@ class RenderViewHostDelegate { // EMF memory mapped data. virtual void DidPrintPage( const ViewHostMsg_DidPrintPage_Params& params) = 0; + + protected: + ~Printing() {} }; // FavIcon ------------------------------------------------------------------- @@ -326,6 +344,9 @@ class RenderViewHostDelegate { virtual void UpdateFavIconURL(RenderViewHost* render_view_host, int32 page_id, const GURL& icon_url) = 0; + + protected: + ~FavIcon() {} }; // AutoFill ------------------------------------------------------------------ @@ -352,6 +373,9 @@ class RenderViewHostDelegate { // autofill suggestion from the database. virtual void RemoveAutofillEntry(const std::wstring& field_name, const std::wstring& value) = 0; + + protected: + ~Autofill() {} }; // --------------------------------------------------------------------------- @@ -397,7 +421,7 @@ class RenderViewHostDelegate { // The RenderView is going to be deleted. This is called when each // RenderView is going to be destroyed - virtual void RenderViewDeleted(RenderViewHost* render_view_host) { } + virtual void RenderViewDeleted(RenderViewHost* render_view_host) {} // The RenderView was navigated to a different page. virtual void DidNavigate(RenderViewHost* render_view_host, @@ -542,6 +566,9 @@ class RenderViewHostDelegate { // The RenderView has inserted one css file into page. virtual void DidInsertCSS() {} + + protected: + ~RenderViewHostDelegate() {} }; #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_VIEW_HOST_DELEGATE_H_ diff --git a/chrome/browser/renderer_host/render_widget_host.cc b/chrome/browser/renderer_host/render_widget_host.cc index 40fba47..2397c79 100644 --- a/chrome/browser/renderer_host/render_widget_host.cc +++ b/chrome/browser/renderer_host/render_widget_host.cc @@ -96,7 +96,7 @@ RenderWidgetHost::~RenderWidgetHost() { gfx::NativeViewId RenderWidgetHost::GetNativeViewId() { if (view_) return gfx::IdFromNativeView(view_->GetNativeView()); - return NULL; + return 0; } void RenderWidgetHost::Init() { diff --git a/chrome/browser/renderer_host/render_widget_host_painting_observer.h b/chrome/browser/renderer_host/render_widget_host_painting_observer.h index d24b61a..652ec47 100644 --- a/chrome/browser/renderer_host/render_widget_host_painting_observer.h +++ b/chrome/browser/renderer_host/render_widget_host_painting_observer.h @@ -19,6 +19,9 @@ class RenderWidgetHostPaintingObserver { // Indicates that the RenderWidgetHost just updated the backing store. virtual void WidgetDidUpdateBackingStore(RenderWidgetHost* widget) = 0; + + protected: + ~RenderWidgetHostPaintingObserver() {} }; #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_PAINTING_OBSERVER_H_ diff --git a/chrome/browser/renderer_host/resource_message_filter.cc b/chrome/browser/renderer_host/resource_message_filter.cc index c8183bb..8df6c4c 100644 --- a/chrome/browser/renderer_host/resource_message_filter.cc +++ b/chrome/browser/renderer_host/resource_message_filter.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -735,7 +735,7 @@ void ResourceMessageFilter::OnGetDefaultPrintSettings(IPC::Message* reply_msg) { // Loads default settings. This is asynchronous, only the IPC message sender // will hang until the settings are retrieved. printer_query->GetSettings(printing::PrinterQuery::DEFAULTS, - NULL, + 0, 0, false, task); |