athena/main/athena_content_client.h - Issue 623103002: replace OVERRIDE and FINAL with override and final in athena/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: athena/main/athena_content_client.h

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/input/input_manager_impl.cc ('k') | athena/main/athena_frame_view.h » ('j') | no next file with comments »

OLD	NEW
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 #ifndef ATHENA_MAIN_ATHENA_CONTENT_CLIENT_H_	5 #ifndef ATHENA_MAIN_ATHENA_CONTENT_CLIENT_H_

6 #define ATHENA_MAIN_ATHENA_CONTENT_CLIENT_H_	6 #define ATHENA_MAIN_ATHENA_CONTENT_CLIENT_H_

7	7

8 #include "extensions/shell/common/shell_content_client.h"	8 #include "extensions/shell/common/shell_content_client.h"

9	9

10 namespace athena {	10 namespace athena {

11	11

12 class AthenaContentClient : public extensions::ShellContentClient {	12 class AthenaContentClient : public extensions::ShellContentClient {

13 public:	13 public:

14 AthenaContentClient();	14 AthenaContentClient();

15 virtual ~AthenaContentClient();	15 virtual ~AthenaContentClient();

16	16

17 private:	17 private:

18 // extensions::ShellContentClient:	18 // extensions::ShellContentClient:

19 virtual void AddPepperPlugins(	19 virtual void AddPepperPlugins(

20 std::vector<content::PepperPluginInfo>* plugins) OVERRIDE;	20 std::vector<content::PepperPluginInfo>* plugins) override;

21	21

22 DISALLOW_COPY_AND_ASSIGN(AthenaContentClient);	22 DISALLOW_COPY_AND_ASSIGN(AthenaContentClient);

23 };	23 };

24	24

25 } // namespace athena	25 } // namespace athena

26	26

27 #endif // ATHENA_MAIN_ATHENA_CONTENT_CLIENT_H_	27 #endif // ATHENA_MAIN_ATHENA_CONTENT_CLIENT_H_

OLD	NEW