| Index: android_webview/native/aw_web_contents_delegate.h
|
| diff --git a/android_webview/native/aw_web_contents_delegate.h b/android_webview/native/aw_web_contents_delegate.h
|
| index 824c9227c27b205b8d6653916f5b71903b7d6e92..f45d3128acdb29cef8c6885057550c54d36dc2c3 100644
|
| --- a/android_webview/native/aw_web_contents_delegate.h
|
| +++ b/android_webview/native/aw_web_contents_delegate.h
|
| @@ -20,43 +20,43 @@ class AwWebContentsDelegate
|
| AwWebContentsDelegate(JNIEnv* env, jobject obj);
|
| virtual ~AwWebContentsDelegate();
|
| virtual content::JavaScriptDialogManager* GetJavaScriptDialogManager()
|
| - OVERRIDE;
|
| + override;
|
| virtual void FindReply(content::WebContents* web_contents,
|
| int request_id,
|
| int number_of_matches,
|
| const gfx::Rect& selection_rect,
|
| int active_match_ordinal,
|
| - bool final_update) OVERRIDE;
|
| + bool final_update) override;
|
| virtual void CanDownload(content::RenderViewHost* source,
|
| const GURL& url,
|
| const std::string& request_method,
|
| - const base::Callback<void(bool)>& callback) OVERRIDE;
|
| + const base::Callback<void(bool)>& callback) override;
|
| virtual void RunFileChooser(
|
| content::WebContents* web_contents,
|
| - const content::FileChooserParams& params) OVERRIDE;
|
| + const content::FileChooserParams& params) override;
|
| virtual void AddNewContents(content::WebContents* source,
|
| content::WebContents* new_contents,
|
| WindowOpenDisposition disposition,
|
| const gfx::Rect& initial_pos,
|
| bool user_gesture,
|
| - bool* was_blocked) OVERRIDE;
|
| + bool* was_blocked) override;
|
|
|
| virtual void WebContentsCreated(content::WebContents* source_contents,
|
| int opener_render_frame_id,
|
| const base::string16& frame_name,
|
| const GURL& target_url,
|
| - content::WebContents* new_contents) OVERRIDE;
|
| + content::WebContents* new_contents) override;
|
|
|
| - virtual void CloseContents(content::WebContents* source) OVERRIDE;
|
| - virtual void ActivateContents(content::WebContents* contents) OVERRIDE;
|
| + virtual void CloseContents(content::WebContents* source) override;
|
| + virtual void ActivateContents(content::WebContents* contents) override;
|
| virtual void RequestMediaAccessPermission(
|
| content::WebContents* web_contents,
|
| const content::MediaStreamRequest& request,
|
| - const content::MediaResponseCallback& callback) OVERRIDE;
|
| + const content::MediaResponseCallback& callback) override;
|
| virtual void ToggleFullscreenModeForTab(content::WebContents* web_contents,
|
| - bool enter_fullscreen) OVERRIDE;
|
| + bool enter_fullscreen) override;
|
| virtual bool IsFullscreenForTabOrPending(
|
| - const content::WebContents* web_contents) const OVERRIDE;
|
| + const content::WebContents* web_contents) const override;
|
|
|
| private:
|
| bool is_fullscreen_;
|
|
|