summaryrefslogtreecommitdiffstats
path: root/ui/keyboard/webui/vk_webui_controller.h
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-10-29 13:07:24 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-29 20:07:50 +0000
commitbc07fa0200dee43bf23c3963357ea7fb41cd91c3 (patch)
tree237476f9f00b31535d9d5d00586db015dcc4e13e /ui/keyboard/webui/vk_webui_controller.h
parente06ac71b008ed40a81c2152382a31c23e537934d (diff)
downloadchromium_src-bc07fa0200dee43bf23c3963357ea7fb41cd91c3.zip
chromium_src-bc07fa0200dee43bf23c3963357ea7fb41cd91c3.tar.gz
chromium_src-bc07fa0200dee43bf23c3963357ea7fb41cd91c3.tar.bz2
Standardize usage of virtual/override/final specifiers.
The Google C++ style guide states: Explicitly annotate overrides of virtual functions or virtual destructors with an override or (less frequently) final specifier. Older (pre-C++11) code will use the virtual keyword as an inferior alternative annotation. For clarity, use exactly one of override, final, or virtual when declaring an override. To better conform to these guidelines, the following constructs have been rewritten: - if a base class has a virtual destructor, then: virtual ~Foo(); -> ~Foo() override; - virtual void Foo() override; -> void Foo() override; - virtual void Foo() override final; -> void Foo() final; This patch was automatically generated. The clang plugin can generate fixit hints, which are suggested edits when it is 100% sure it knows how to fix a problem. The hints from the clang plugin were applied to the source tree using the tool in https://codereview.chromium.org/598073004. BUG=417463 R=sky@chromium.org Review URL: https://codereview.chromium.org/670923003 Cr-Commit-Position: refs/heads/master@{#301914}
Diffstat (limited to 'ui/keyboard/webui/vk_webui_controller.h')
-rw-r--r--ui/keyboard/webui/vk_webui_controller.h19
1 files changed, 9 insertions, 10 deletions
diff --git a/ui/keyboard/webui/vk_webui_controller.h b/ui/keyboard/webui/vk_webui_controller.h
index 97ee5a56..30d1e25 100644
--- a/ui/keyboard/webui/vk_webui_controller.h
+++ b/ui/keyboard/webui/vk_webui_controller.h
@@ -26,14 +26,14 @@ class VKMojoHandler;
class VKWebUIController : public content::WebUIController {
public:
explicit VKWebUIController(content::WebUI* web_ui);
- virtual ~VKWebUIController();
+ ~VKWebUIController() override;
private:
void CreateAndStoreUIHandler(
mojo::InterfaceRequest<KeyboardUIHandlerMojo> request);
// content::WebUIController:
- virtual void RenderViewCreated(content::RenderViewHost* host) override;
+ void RenderViewCreated(content::RenderViewHost* host) override;
scoped_ptr<VKMojoHandler> ui_handler_;
base::WeakPtrFactory<VKWebUIController> weak_factory_;
@@ -45,14 +45,13 @@ class KEYBOARD_EXPORT VKWebUIControllerFactory
: public content::WebUIControllerFactory {
public:
// WebUIControllerFactory:
- virtual content::WebUI::TypeID GetWebUIType(
- content::BrowserContext* browser_context,
- const GURL& url) const override;
- virtual bool UseWebUIForURL(content::BrowserContext* browser_context,
- const GURL& url) const override;
- virtual bool UseWebUIBindingsForURL(content::BrowserContext* browser_context,
+ content::WebUI::TypeID GetWebUIType(content::BrowserContext* browser_context,
const GURL& url) const override;
- virtual content::WebUIController* CreateWebUIControllerForURL(
+ bool UseWebUIForURL(content::BrowserContext* browser_context,
+ const GURL& url) const override;
+ bool UseWebUIBindingsForURL(content::BrowserContext* browser_context,
+ const GURL& url) const override;
+ content::WebUIController* CreateWebUIControllerForURL(
content::WebUI* web_ui,
const GURL& url) const override;
@@ -60,7 +59,7 @@ class KEYBOARD_EXPORT VKWebUIControllerFactory
protected:
VKWebUIControllerFactory();
- virtual ~VKWebUIControllerFactory();
+ ~VKWebUIControllerFactory() override;
private:
friend struct DefaultSingletonTraits<VKWebUIControllerFactory>;