| Index: apps/custom_launcher_page_contents.h
|
| diff --git a/apps/custom_launcher_page_contents.h b/apps/custom_launcher_page_contents.h
|
| index eaa7673a56144a106171b5c97dad178ac6da4ec9..8465a05f5a39694fbdfbd7484bd9cf7985503563 100644
|
| --- a/apps/custom_launcher_page_contents.h
|
| +++ b/apps/custom_launcher_page_contents.h
|
| @@ -44,46 +44,46 @@ class CustomLauncherPageContents
|
| // content::WebContentsDelegate overrides:
|
| virtual content::WebContents* OpenURLFromTab(
|
| content::WebContents* source,
|
| - const content::OpenURLParams& params) OVERRIDE;
|
| + const content::OpenURLParams& 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 bool IsPopupOrPanel(
|
| - const content::WebContents* source) const OVERRIDE;
|
| - virtual bool ShouldSuppressDialogs() OVERRIDE;
|
| + const content::WebContents* source) const override;
|
| + virtual bool ShouldSuppressDialogs() override;
|
| virtual bool PreHandleGestureEvent(
|
| content::WebContents* source,
|
| - const blink::WebGestureEvent& event) OVERRIDE;
|
| + const blink::WebGestureEvent& event) override;
|
| virtual content::ColorChooser* OpenColorChooser(
|
| content::WebContents* web_contents,
|
| SkColor color,
|
| - const std::vector<content::ColorSuggestion>& suggestions) OVERRIDE;
|
| + const std::vector<content::ColorSuggestion>& suggestions) override;
|
| virtual void RunFileChooser(
|
| content::WebContents* tab,
|
| - const content::FileChooserParams& params) OVERRIDE;
|
| + const content::FileChooserParams& params) override;
|
| virtual void RequestToLockMouse(content::WebContents* web_contents,
|
| bool user_gesture,
|
| - bool last_unlocked_by_target) OVERRIDE;
|
| + bool last_unlocked_by_target) override;
|
| virtual void RequestMediaAccessPermission(
|
| content::WebContents* web_contents,
|
| const content::MediaStreamRequest& request,
|
| - const content::MediaResponseCallback& callback) OVERRIDE;
|
| + const content::MediaResponseCallback& callback) override;
|
| virtual bool CheckMediaAccessPermission(
|
| content::WebContents* web_contents,
|
| const GURL& security_origin,
|
| - content::MediaStreamType type) OVERRIDE;
|
| + content::MediaStreamType type) override;
|
|
|
| private:
|
| // content::WebContentsObserver overrides:
|
| - virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
|
| + virtual bool OnMessageReceived(const IPC::Message& message) override;
|
|
|
| // extensions::ExtensionFunctionDispatcher::Delegate overrides:
|
| virtual extensions::WindowController* GetExtensionWindowController()
|
| - const OVERRIDE;
|
| - virtual content::WebContents* GetAssociatedWebContents() const OVERRIDE;
|
| + const override;
|
| + virtual content::WebContents* GetAssociatedWebContents() const override;
|
|
|
| void OnRequest(const ExtensionHostMsg_Request_Params& params);
|
|
|
|
|