summaryrefslogtreecommitdiffstats
path: root/ui/views_content_client
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2015-01-15 15:11:21 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-15 23:12:15 +0000
commiteb25a619587ab419e2a4f5d3486b8bb2d8e8a5ff (patch)
tree8baaba34d093e97f725c76f898f67c212ce8c9ec /ui/views_content_client
parent67c6eac492d4b26809bfc097e5fc303af74e2c02 (diff)
downloadchromium_src-eb25a619587ab419e2a4f5d3486b8bb2d8e8a5ff.zip
chromium_src-eb25a619587ab419e2a4f5d3486b8bb2d8e8a5ff.tar.gz
chromium_src-eb25a619587ab419e2a4f5d3486b8bb2d8e8a5ff.tar.bz2
Update {virtual,override,final} to follow C++11 style in ui.
The Google style guide states that only one of {virtual,override,final} should be used for each declaration, since override implies virtual and final implies both virtual and override. This patch was automatically generated with a ChromeOS build using a variation of https://codereview.chromium.org/598073004. BUG=417463 R=avi@chromium.org Review URL: https://codereview.chromium.org/853073002 Cr-Commit-Position: refs/heads/master@{#311759}
Diffstat (limited to 'ui/views_content_client')
-rw-r--r--ui/views_content_client/views_content_client_main_parts_chromeos.cc11
1 files changed, 5 insertions, 6 deletions
diff --git a/ui/views_content_client/views_content_client_main_parts_chromeos.cc b/ui/views_content_client/views_content_client_main_parts_chromeos.cc
index 5198eeb..dc4162b 100644
--- a/ui/views_content_client/views_content_client_main_parts_chromeos.cc
+++ b/ui/views_content_client/views_content_client_main_parts_chromeos.cc
@@ -21,11 +21,10 @@ namespace {
class NestedAcceleratorDelegate : public ::wm::NestedAcceleratorDelegate {
public:
NestedAcceleratorDelegate() {}
- virtual ~NestedAcceleratorDelegate() {}
+ ~NestedAcceleratorDelegate() override {}
// ::wm::NestedAcceleratorDelegate:
- virtual Result ProcessAccelerator(
- const ui::Accelerator& accelerator) override {
+ Result ProcessAccelerator(const ui::Accelerator& accelerator) override {
return RESULT_NOT_PROCESSED;
}
@@ -39,11 +38,11 @@ class ViewsContentClientMainPartsChromeOS
ViewsContentClientMainPartsChromeOS(
const content::MainFunctionParams& content_params,
ViewsContentClient* views_content_client);
- virtual ~ViewsContentClientMainPartsChromeOS() {}
+ ~ViewsContentClientMainPartsChromeOS() override {}
// content::BrowserMainParts:
- virtual void PreMainMessageLoopRun() override;
- virtual void PostMainMessageLoopRun() override;
+ void PreMainMessageLoopRun() override;
+ void PostMainMessageLoopRun() override;
private:
// Enable a minimal set of views::corewm to be initialized.