Index: chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.h |
diff --git a/chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.h b/chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.h |
index 3c57dba79782208c3dad6c0998d7f36e4597da71..069aef7d733905d858ddca712e2bf4bc9df2728b 100644 |
--- a/chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.h |
+++ b/chrome/browser/component/web_contents_delegate_android/web_contents_delegate_android.h |
@@ -58,14 +58,6 @@ class WebContentsDelegateAndroid : public content::WebContentsDelegate { |
content::WebContents* source, |
const content::OpenURLParams& params) OVERRIDE; |
- // Don't merge back. |
- // TODO(mkosiba): Upstream base class's implementaion of this method. |
- virtual bool ShouldIgnoreNavigation( |
- content::WebContents* source, |
- const GURL& url, |
- const content::Referrer& referrer, |
- WindowOpenDisposition disposition, |
- content::PageTransition transition_type); |
virtual void NavigationStateChanged(const content::WebContents* source, |
unsigned changed_flags) OVERRIDE; |
virtual void AddNewContents(content::WebContents* source, |
@@ -93,7 +85,6 @@ class WebContentsDelegateAndroid : public content::WebContentsDelegate { |
virtual void UpdateTargetURL(content::WebContents* source, |
int32 page_id, |
const GURL& url) OVERRIDE; |
- virtual bool ShouldOverrideLoading(const GURL& url) OVERRIDE; |
virtual void HandleKeyboardEvent( |
content::WebContents* source, |
const content::NativeWebKeyboardEvent& event) OVERRIDE; |