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

Side by Side Diff: athena/main/athena_views_delegate.cc

Issue 623103002: replace OVERRIDE and FINAL with override and final in athena/ (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
« no previous file with comments | « athena/main/athena_renderer_pdf_helper.cc ('k') | athena/main/url_search_provider.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "athena/main/athena_views_delegate.h" 5 #include "athena/main/athena_views_delegate.h"
6 6
7 #include "athena/main/athena_frame_view.h" 7 #include "athena/main/athena_frame_view.h"
8 #include "athena/screen/public/screen_manager.h" 8 #include "athena/screen/public/screen_manager.h"
9 #include "ui/views/views_delegate.h" 9 #include "ui/views/views_delegate.h"
10 10
11 namespace athena { 11 namespace athena {
12 12
13 namespace { 13 namespace {
14 14
15 class AthenaViewsDelegate: public views::ViewsDelegate { 15 class AthenaViewsDelegate: public views::ViewsDelegate {
16 public: 16 public:
17 AthenaViewsDelegate() { 17 AthenaViewsDelegate() {
18 } 18 }
19 19
20 virtual ~AthenaViewsDelegate() { 20 virtual ~AthenaViewsDelegate() {
21 } 21 }
22 22
23 virtual void OnBeforeWidgetInit( 23 virtual void OnBeforeWidgetInit(
24 views::Widget::InitParams* params, 24 views::Widget::InitParams* params,
25 views::internal::NativeWidgetDelegate* delegate) OVERRIDE { 25 views::internal::NativeWidgetDelegate* delegate) override {
26 params->context = athena::ScreenManager::Get()->GetContext(); 26 params->context = athena::ScreenManager::Get()->GetContext();
27 } 27 }
28 28
29 virtual views::NonClientFrameView* CreateDefaultNonClientFrameView( 29 virtual views::NonClientFrameView* CreateDefaultNonClientFrameView(
30 views::Widget* widget) OVERRIDE { 30 views::Widget* widget) override {
31 return new AthenaFrameView(widget); 31 return new AthenaFrameView(widget);
32 } 32 }
33 33
34 private: 34 private:
35 DISALLOW_COPY_AND_ASSIGN(AthenaViewsDelegate); 35 DISALLOW_COPY_AND_ASSIGN(AthenaViewsDelegate);
36 }; 36 };
37 37
38 } // namespace 38 } // namespace
39 39
40 void CreateAthenaViewsDelegate() { 40 void CreateAthenaViewsDelegate() {
41 views::ViewsDelegate::views_delegate = new AthenaViewsDelegate; 41 views::ViewsDelegate::views_delegate = new AthenaViewsDelegate;
42 } 42 }
43 43
44 void ShutdownAthenaViewsDelegate() { 44 void ShutdownAthenaViewsDelegate() {
45 CHECK(views::ViewsDelegate::views_delegate); 45 CHECK(views::ViewsDelegate::views_delegate);
46 delete views::ViewsDelegate::views_delegate; 46 delete views::ViewsDelegate::views_delegate;
47 views::ViewsDelegate::views_delegate = NULL; 47 views::ViewsDelegate::views_delegate = NULL;
48 } 48 }
49 49
50 } // namespace athena 50 } // namespace athena
OLDNEW
« no previous file with comments | « athena/main/athena_renderer_pdf_helper.cc ('k') | athena/main/url_search_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698