Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(93)

Side by Side Diff: ui/views_content_client/views_content_client_main_parts_chromeos.cc

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/public/browser/context_factory.h" 5 #include "content/public/browser/context_factory.h"
6 #include "content/shell/browser/shell_browser_context.h" 6 #include "content/shell/browser/shell_browser_context.h"
7 #include "ui/aura/test/test_screen.h" 7 #include "ui/aura/test/test_screen.h"
8 #include "ui/aura/window.h" 8 #include "ui/aura/window.h"
9 #include "ui/gfx/screen.h" 9 #include "ui/gfx/screen.h"
10 #include "ui/views_content_client/views_content_client.h" 10 #include "ui/views_content_client/views_content_client.h"
11 #include "ui/views_content_client/views_content_client_main_parts_aura.h" 11 #include "ui/views_content_client/views_content_client_main_parts_aura.h"
12 #include "ui/wm/core/nested_accelerator_controller.h" 12 #include "ui/wm/core/nested_accelerator_controller.h"
13 #include "ui/wm/core/nested_accelerator_delegate.h" 13 #include "ui/wm/core/nested_accelerator_delegate.h"
14 #include "ui/wm/test/wm_test_helper.h" 14 #include "ui/wm/test/wm_test_helper.h"
15 15
16 namespace ui { 16 namespace ui {
17 17
18 namespace { 18 namespace {
19 19
20 // A dummy version of the delegate usually provided by the Ash Shell. 20 // A dummy version of the delegate usually provided by the Ash Shell.
21 class NestedAcceleratorDelegate : public ::wm::NestedAcceleratorDelegate { 21 class NestedAcceleratorDelegate : public ::wm::NestedAcceleratorDelegate {
22 public: 22 public:
23 NestedAcceleratorDelegate() {} 23 NestedAcceleratorDelegate() {}
24 virtual ~NestedAcceleratorDelegate() {} 24 virtual ~NestedAcceleratorDelegate() {}
25 25
26 // ::wm::NestedAcceleratorDelegate: 26 // ::wm::NestedAcceleratorDelegate:
27 virtual Result ProcessAccelerator( 27 virtual Result ProcessAccelerator(
28 const ui::Accelerator& accelerator) OVERRIDE { 28 const ui::Accelerator& accelerator) override {
29 return RESULT_NOT_PROCESSED; 29 return RESULT_NOT_PROCESSED;
30 } 30 }
31 31
32 private: 32 private:
33 DISALLOW_COPY_AND_ASSIGN(NestedAcceleratorDelegate); 33 DISALLOW_COPY_AND_ASSIGN(NestedAcceleratorDelegate);
34 }; 34 };
35 35
36 class ViewsContentClientMainPartsChromeOS 36 class ViewsContentClientMainPartsChromeOS
37 : public ViewsContentClientMainPartsAura { 37 : public ViewsContentClientMainPartsAura {
38 public: 38 public:
39 ViewsContentClientMainPartsChromeOS( 39 ViewsContentClientMainPartsChromeOS(
40 const content::MainFunctionParams& content_params, 40 const content::MainFunctionParams& content_params,
41 ViewsContentClient* views_content_client); 41 ViewsContentClient* views_content_client);
42 virtual ~ViewsContentClientMainPartsChromeOS() {} 42 virtual ~ViewsContentClientMainPartsChromeOS() {}
43 43
44 // content::BrowserMainParts: 44 // content::BrowserMainParts:
45 virtual void PreMainMessageLoopRun() OVERRIDE; 45 virtual void PreMainMessageLoopRun() override;
46 virtual void PostMainMessageLoopRun() OVERRIDE; 46 virtual void PostMainMessageLoopRun() override;
47 47
48 private: 48 private:
49 // Enable a minimal set of views::corewm to be initialized. 49 // Enable a minimal set of views::corewm to be initialized.
50 scoped_ptr<gfx::Screen> test_screen_; 50 scoped_ptr<gfx::Screen> test_screen_;
51 scoped_ptr< ::wm::WMTestHelper> wm_test_helper_; 51 scoped_ptr< ::wm::WMTestHelper> wm_test_helper_;
52 scoped_ptr< ::wm::NestedAcceleratorController> nested_accelerator_controller_; 52 scoped_ptr< ::wm::NestedAcceleratorController> nested_accelerator_controller_;
53 53
54 DISALLOW_COPY_AND_ASSIGN(ViewsContentClientMainPartsChromeOS); 54 DISALLOW_COPY_AND_ASSIGN(ViewsContentClientMainPartsChromeOS);
55 }; 55 };
56 56
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 95
96 // static 96 // static
97 ViewsContentClientMainParts* ViewsContentClientMainParts::Create( 97 ViewsContentClientMainParts* ViewsContentClientMainParts::Create(
98 const content::MainFunctionParams& content_params, 98 const content::MainFunctionParams& content_params,
99 ViewsContentClient* views_content_client) { 99 ViewsContentClient* views_content_client) {
100 return new ViewsContentClientMainPartsChromeOS( 100 return new ViewsContentClientMainPartsChromeOS(
101 content_params, views_content_client); 101 content_params, views_content_client);
102 } 102 }
103 103
104 } // namespace ui 104 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698