Fix warnings when compiling with clang

TBR=scherkus BUG=143931 Review URL: https://chromiumcodereview.appspot.com/10983004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158493 0039d316-1c4b-4281-b951-d872f2087c98
Denger-Network · Sep 25, 2012 · 42690ee · 42690ee
1 parent ddf0b4b
commit 42690ee
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 12 deletions.
diff --git a/android_webview/lib/aw_browser_dependency_factory_impl.cc b/android_webview/lib/aw_browser_dependency_factory_impl.cc
@@ -14,7 +14,6 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.h"
 #include "content/public/browser/web_contents.h"
 #include "ipc/ipc_message.h"
 #include "net/url_request/url_request_context.h"
@@ -102,9 +101,4 @@ AwContentsContainer* AwBrowserDependencyFactoryImpl::CreateContentsContainer(
   return new WebContentsWrapper(contents);
 }
 
-content::JavaScriptDialogCreator*
-    AwBrowserDependencyFactoryImpl::GetJavaScriptDialogCreator() {
-  return GetJavaScriptDialogCreatorInstance();
-}
-
 }  // namespace android_webview
diff --git a/android_webview/lib/aw_browser_dependency_factory_impl.h b/android_webview/lib/aw_browser_dependency_factory_impl.h
@@ -31,8 +31,6 @@ class AwBrowserDependencyFactoryImpl : public AwBrowserDependencyFactory {
   virtual content::WebContents* CreateWebContents(bool incognito) OVERRIDE;
   virtual AwContentsContainer* CreateContentsContainer(
       content::WebContents* contents) OVERRIDE;
-  virtual content::JavaScriptDialogCreator* GetJavaScriptDialogCreator()
-      OVERRIDE;
 
  private:
   void InitializeNetworkDelegateOnIOThread(
@@ -51,4 +49,3 @@ class AwBrowserDependencyFactoryImpl : public AwBrowserDependencyFactory {
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_LIB_BROWSER_DELEGATE_IMPL_H_
-
diff --git a/content/browser/android/cookie_getter_impl.cc b/content/browser/android/cookie_getter_impl.cc
@@ -34,14 +34,16 @@ class CookieGetterTask
  public:
   CookieGetterTask(BrowserContext* browser_context,
                    int renderer_id, int routing_id);
-  virtual ~CookieGetterTask();
 
   // Called by CookieGetterImpl to start getting cookies for a URL.
   void RequestCookies(
       const GURL& url, const GURL& first_party_for_cookies,
       const media::CookieGetter::GetCookieCB& callback);
 
  private:
+  friend class base::RefCountedThreadSafe<CookieGetterTask>;
+  virtual ~CookieGetterTask();
+
   void CheckPolicyForCookies(
       const GURL& url, const GURL& first_party_for_cookies,
       const media::CookieGetter::GetCookieCB& callback,

diff --git a/content/renderer/media/webmediaplayer_proxy_impl_android.h b/content/renderer/media/webmediaplayer_proxy_impl_android.h
@@ -32,7 +32,7 @@ class WebMediaPlayerProxyImplAndroid
       webkit_media::WebMediaPlayerManagerAndroid* manager);
   virtual ~WebMediaPlayerProxyImplAndroid();
 
-  bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
 
   // Methods inherited from WebMediaPlayerProxyAndroid.
   virtual void Initialize(int player_id, const std::string& url,

diff --git a/media/base/android/media_player_bridge.cc b/media/base/android/media_player_bridge.cc
@@ -276,7 +276,7 @@ void MediaPlayerBridge::OnMediaError(int error_type) {
 
 void MediaPlayerBridge::OnVideoSizeChanged(int width, int height) {
   width_ = width;
-  height_ = height_;
+  height_ = height;
   video_size_changed_cb_.Run(player_id_, width, height);
 }