| Index: content/browser/webui/web_ui_impl.h
|
| diff --git a/content/browser/webui/web_ui_impl.h b/content/browser/webui/web_ui_impl.h
|
| index b399fceadf8a00fd20d3a75ec75e3fd81aed49f0..c08db2927f6a33f52350d011adfda47c7f538d4e 100644
|
| --- a/content/browser/webui/web_ui_impl.h
|
| +++ b/content/browser/webui/web_ui_impl.h
|
| @@ -23,7 +23,7 @@ class CONTENT_EXPORT WebUIImpl : public WebUI,
|
| public base::SupportsWeakPtr<WebUIImpl> {
|
| public:
|
| explicit WebUIImpl(WebContents* contents);
|
| - virtual ~WebUIImpl();
|
| + ~WebUIImpl() override;
|
|
|
| // Called by WebContentsImpl when the RenderView is first created. This is
|
| // *not* called for every page load because in some cases
|
| @@ -31,47 +31,45 @@ class CONTENT_EXPORT WebUIImpl : public WebUI,
|
| void RenderViewCreated(RenderViewHost* render_view_host);
|
|
|
| // WebUI implementation:
|
| - virtual WebContents* GetWebContents() const override;
|
| - virtual WebUIController* GetController() const override;
|
| - virtual void SetController(WebUIController* controller) override;
|
| - virtual float GetDeviceScaleFactor() const override;
|
| - virtual const base::string16& GetOverriddenTitle() const override;
|
| - virtual void OverrideTitle(const base::string16& title) override;
|
| - virtual ui::PageTransition GetLinkTransitionType() const override;
|
| - virtual void SetLinkTransitionType(ui::PageTransition type) override;
|
| - virtual int GetBindings() const override;
|
| - virtual void SetBindings(int bindings) override;
|
| - virtual void OverrideJavaScriptFrame(const std::string& frame_name) override;
|
| - virtual void AddMessageHandler(WebUIMessageHandler* handler) override;
|
| + WebContents* GetWebContents() const override;
|
| + WebUIController* GetController() const override;
|
| + void SetController(WebUIController* controller) override;
|
| + float GetDeviceScaleFactor() const override;
|
| + const base::string16& GetOverriddenTitle() const override;
|
| + void OverrideTitle(const base::string16& title) override;
|
| + ui::PageTransition GetLinkTransitionType() const override;
|
| + void SetLinkTransitionType(ui::PageTransition type) override;
|
| + int GetBindings() const override;
|
| + void SetBindings(int bindings) override;
|
| + void OverrideJavaScriptFrame(const std::string& frame_name) override;
|
| + void AddMessageHandler(WebUIMessageHandler* handler) override;
|
| typedef base::Callback<void(const base::ListValue*)> MessageCallback;
|
| - virtual void RegisterMessageCallback(
|
| - const std::string& message,
|
| - const MessageCallback& callback) override;
|
| - virtual void ProcessWebUIMessage(const GURL& source_url,
|
| - const std::string& message,
|
| - const base::ListValue& args) override;
|
| - virtual void CallJavascriptFunction(
|
| - const std::string& function_name) override;
|
| - virtual void CallJavascriptFunction(const std::string& function_name,
|
| - const base::Value& arg) override;
|
| - virtual void CallJavascriptFunction(const std::string& function_name,
|
| - const base::Value& arg1,
|
| - const base::Value& arg2) override;
|
| - virtual void CallJavascriptFunction(const std::string& function_name,
|
| - const base::Value& arg1,
|
| - const base::Value& arg2,
|
| - const base::Value& arg3) override;
|
| - virtual void CallJavascriptFunction(const std::string& function_name,
|
| - const base::Value& arg1,
|
| - const base::Value& arg2,
|
| - const base::Value& arg3,
|
| - const base::Value& arg4) override;
|
| - virtual void CallJavascriptFunction(
|
| + void RegisterMessageCallback(const std::string& message,
|
| + const MessageCallback& callback) override;
|
| + void ProcessWebUIMessage(const GURL& source_url,
|
| + const std::string& message,
|
| + const base::ListValue& args) override;
|
| + void CallJavascriptFunction(const std::string& function_name) override;
|
| + void CallJavascriptFunction(const std::string& function_name,
|
| + const base::Value& arg) override;
|
| + void CallJavascriptFunction(const std::string& function_name,
|
| + const base::Value& arg1,
|
| + const base::Value& arg2) override;
|
| + void CallJavascriptFunction(const std::string& function_name,
|
| + const base::Value& arg1,
|
| + const base::Value& arg2,
|
| + const base::Value& arg3) override;
|
| + void CallJavascriptFunction(const std::string& function_name,
|
| + const base::Value& arg1,
|
| + const base::Value& arg2,
|
| + const base::Value& arg3,
|
| + const base::Value& arg4) override;
|
| + void CallJavascriptFunction(
|
| const std::string& function_name,
|
| const std::vector<const base::Value*>& args) override;
|
|
|
| // IPC::Listener implementation:
|
| - virtual bool OnMessageReceived(const IPC::Message& message) override;
|
| + bool OnMessageReceived(const IPC::Message& message) override;
|
|
|
| private:
|
| // IPC message handling.
|
|
|