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

Side by Side Diff: athena/extensions/chrome/athena_chrome_app_delegate.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
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 #ifndef ATHENA_EXTENSIONS_CHROME_ATHENA_CHROME_APP_DELEGATE_H_ 5 #ifndef ATHENA_EXTENSIONS_CHROME_ATHENA_CHROME_APP_DELEGATE_H_
6 #define ATHENA_EXTENSIONS_CHROME_ATHENA_CHROME_APP_DELEGATE_H_ 6 #define ATHENA_EXTENSIONS_CHROME_ATHENA_CHROME_APP_DELEGATE_H_
7 7
8 #include "athena/extensions/athena_app_delegate_base.h" 8 #include "athena/extensions/athena_app_delegate_base.h"
9 9
10 namespace athena { 10 namespace athena {
11 11
12 class AthenaChromeAppDelegate : public AthenaAppDelegateBase { 12 class AthenaChromeAppDelegate : public AthenaAppDelegateBase {
13 public: 13 public:
14 AthenaChromeAppDelegate(); 14 AthenaChromeAppDelegate();
15 virtual ~AthenaChromeAppDelegate(); 15 virtual ~AthenaChromeAppDelegate();
16 16
17 private: 17 private:
18 // extensions::AppDelegate: 18 // extensions::AppDelegate:
19 virtual void InitWebContents(content::WebContents* web_contents) OVERRIDE; 19 virtual void InitWebContents(content::WebContents* web_contents) override;
20 virtual content::ColorChooser* ShowColorChooser( 20 virtual content::ColorChooser* ShowColorChooser(
21 content::WebContents* web_contents, 21 content::WebContents* web_contents,
22 SkColor initial_color) OVERRIDE; 22 SkColor initial_color) override;
23 virtual void RunFileChooser( 23 virtual void RunFileChooser(
24 content::WebContents* tab, 24 content::WebContents* tab,
25 const content::FileChooserParams& params) OVERRIDE; 25 const content::FileChooserParams& params) override;
26 virtual void RequestMediaAccessPermission( 26 virtual void RequestMediaAccessPermission(
27 content::WebContents* web_contents, 27 content::WebContents* web_contents,
28 const content::MediaStreamRequest& request, 28 const content::MediaStreamRequest& request,
29 const content::MediaResponseCallback& callback, 29 const content::MediaResponseCallback& callback,
30 const extensions::Extension* extension) OVERRIDE; 30 const extensions::Extension* extension) override;
31 virtual bool CheckMediaAccessPermission( 31 virtual bool CheckMediaAccessPermission(
32 content::WebContents* web_contents, 32 content::WebContents* web_contents,
33 const GURL& security_origin, 33 const GURL& security_origin,
34 content::MediaStreamType type, 34 content::MediaStreamType type,
35 const extensions::Extension* extension) OVERRIDE; 35 const extensions::Extension* extension) override;
36 virtual void SetWebContentsBlocked(content::WebContents* web_contents, 36 virtual void SetWebContentsBlocked(content::WebContents* web_contents,
37 bool blocked) OVERRIDE; 37 bool blocked) override;
38 38
39 DISALLOW_COPY_AND_ASSIGN(AthenaChromeAppDelegate); 39 DISALLOW_COPY_AND_ASSIGN(AthenaChromeAppDelegate);
40 }; 40 };
41 41
42 } // namespace athena 42 } // namespace athena
43 43
44 #endif // ATHENA_EXTENSIONS_CHROME_ATHENA_CHROME_APP_DELEGATE_H_ 44 #endif // ATHENA_EXTENSIONS_CHROME_ATHENA_CHROME_APP_DELEGATE_H_
OLDNEW
« no previous file with comments | « athena/extensions/athena_app_window_client_base.h ('k') | athena/extensions/chrome/athena_chrome_app_window_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698