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

Side by Side Diff: athena/extensions/athena_app_delegate_base.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/env/athena_env_impl.cc ('k') | athena/extensions/athena_app_delegate_base.cc » ('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 #ifndef ATHENA_EXTENSIONS_ATHENA_APP_DELEGATE_BASE_H_ 5 #ifndef ATHENA_EXTENSIONS_ATHENA_APP_DELEGATE_BASE_H_
6 #define ATHENA_EXTENSIONS_ATHENA_APP_DELEGATE_BASE_H_ 6 #define ATHENA_EXTENSIONS_ATHENA_APP_DELEGATE_BASE_H_
7 7
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "extensions/browser/app_window/app_delegate.h" 10 #include "extensions/browser/app_window/app_delegate.h"
11 11
12 namespace athena { 12 namespace athena {
13 13
14 class AthenaAppDelegateBase : public extensions::AppDelegate { 14 class AthenaAppDelegateBase : public extensions::AppDelegate {
15 public: 15 public:
16 AthenaAppDelegateBase(); 16 AthenaAppDelegateBase();
17 virtual ~AthenaAppDelegateBase(); 17 virtual ~AthenaAppDelegateBase();
18 18
19 private: 19 private:
20 class NewActivityContentsDelegate; 20 class NewActivityContentsDelegate;
21 21
22 // extensions::AppDelegate: 22 // extensions::AppDelegate:
23 virtual void ResizeWebContents(content::WebContents* web_contents, 23 virtual void ResizeWebContents(content::WebContents* web_contents,
24 const gfx::Size& size) OVERRIDE; 24 const gfx::Size& size) override;
25 virtual content::WebContents* OpenURLFromTab( 25 virtual content::WebContents* OpenURLFromTab(
26 content::BrowserContext* context, 26 content::BrowserContext* context,
27 content::WebContents* source, 27 content::WebContents* source,
28 const content::OpenURLParams& params) OVERRIDE; 28 const content::OpenURLParams& params) override;
29 virtual void AddNewContents(content::BrowserContext* context, 29 virtual void AddNewContents(content::BrowserContext* context,
30 content::WebContents* new_contents, 30 content::WebContents* new_contents,
31 WindowOpenDisposition disposition, 31 WindowOpenDisposition disposition,
32 const gfx::Rect& initial_pos, 32 const gfx::Rect& initial_pos,
33 bool user_gesture, 33 bool user_gesture,
34 bool* was_blocked) OVERRIDE; 34 bool* was_blocked) override;
35 virtual int PreferredIconSize() OVERRIDE; 35 virtual int PreferredIconSize() override;
36 virtual bool IsWebContentsVisible( 36 virtual bool IsWebContentsVisible(
37 content::WebContents* web_contents) OVERRIDE; 37 content::WebContents* web_contents) override;
38 virtual void SetTerminatingCallback(const base::Closure& callback) OVERRIDE; 38 virtual void SetTerminatingCallback(const base::Closure& callback) override;
39 39
40 scoped_ptr<NewActivityContentsDelegate> new_window_contents_delegate_; 40 scoped_ptr<NewActivityContentsDelegate> new_window_contents_delegate_;
41 base::Closure terminating_callback_; 41 base::Closure terminating_callback_;
42 42
43 DISALLOW_COPY_AND_ASSIGN(AthenaAppDelegateBase); 43 DISALLOW_COPY_AND_ASSIGN(AthenaAppDelegateBase);
44 }; 44 };
45 45
46 } // namespace athena 46 } // namespace athena
47 47
48 #endif // ATHENA_EXTENSIONS_ATHENA_APP_DELEGATE_BASE_H_ 48 #endif // ATHENA_EXTENSIONS_ATHENA_APP_DELEGATE_BASE_H_
OLDNEW
« no previous file with comments | « athena/env/athena_env_impl.cc ('k') | athena/extensions/athena_app_delegate_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698