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

Side by Side Diff: ui/views_content_client/views_content_client_main_parts_desktop_aura.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/shell/browser/shell_browser_context.h" 5 #include "content/shell/browser/shell_browser_context.h"
6 #include "ui/aura/env.h" 6 #include "ui/aura/env.h"
7 #include "ui/gfx/screen.h" 7 #include "ui/gfx/screen.h"
8 #include "ui/views/widget/desktop_aura/desktop_screen.h" 8 #include "ui/views/widget/desktop_aura/desktop_screen.h"
9 #include "ui/views_content_client/views_content_client.h" 9 #include "ui/views_content_client/views_content_client.h"
10 #include "ui/views_content_client/views_content_client_main_parts_aura.h" 10 #include "ui/views_content_client/views_content_client_main_parts_aura.h"
11 11
12 namespace ui { 12 namespace ui {
13 13
14 namespace { 14 namespace {
15 15
16 class ViewsContentClientMainPartsDesktopAura 16 class ViewsContentClientMainPartsDesktopAura
17 : public ViewsContentClientMainPartsAura { 17 : public ViewsContentClientMainPartsAura {
18 public: 18 public:
19 ViewsContentClientMainPartsDesktopAura( 19 ViewsContentClientMainPartsDesktopAura(
20 const content::MainFunctionParams& content_params, 20 const content::MainFunctionParams& content_params,
21 ViewsContentClient* views_content_client); 21 ViewsContentClient* views_content_client);
22 virtual ~ViewsContentClientMainPartsDesktopAura() {} 22 virtual ~ViewsContentClientMainPartsDesktopAura() {}
23 23
24 // content::BrowserMainParts: 24 // content::BrowserMainParts:
25 virtual void PreMainMessageLoopRun() OVERRIDE; 25 virtual void PreMainMessageLoopRun() override;
26 26
27 private: 27 private:
28 DISALLOW_COPY_AND_ASSIGN(ViewsContentClientMainPartsDesktopAura); 28 DISALLOW_COPY_AND_ASSIGN(ViewsContentClientMainPartsDesktopAura);
29 }; 29 };
30 30
31 ViewsContentClientMainPartsDesktopAura::ViewsContentClientMainPartsDesktopAura( 31 ViewsContentClientMainPartsDesktopAura::ViewsContentClientMainPartsDesktopAura(
32 const content::MainFunctionParams& content_params, 32 const content::MainFunctionParams& content_params,
33 ViewsContentClient* views_content_client) 33 ViewsContentClient* views_content_client)
34 : ViewsContentClientMainPartsAura(content_params, views_content_client) { 34 : ViewsContentClientMainPartsAura(content_params, views_content_client) {
35 } 35 }
(...skipping 12 matching lines...) Expand all
48 48
49 // static 49 // static
50 ViewsContentClientMainParts* ViewsContentClientMainParts::Create( 50 ViewsContentClientMainParts* ViewsContentClientMainParts::Create(
51 const content::MainFunctionParams& content_params, 51 const content::MainFunctionParams& content_params,
52 ViewsContentClient* views_content_client) { 52 ViewsContentClient* views_content_client) {
53 return new ViewsContentClientMainPartsDesktopAura( 53 return new ViewsContentClientMainPartsDesktopAura(
54 content_params, views_content_client); 54 content_params, views_content_client);
55 } 55 }
56 56
57 } // namespace ui 57 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698