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_EXTENSIONS_CHROME_ATHENA_APP_DELEGATE_H_ | 5 #ifndef ATHENA_EXTENSIONS_CHROME_ATHENA_APP_DELEGATE_H_ |
6 #define ATHENA_EXTENSIONS_CHROME_ATHENA_APP_DELEGATE_H_ | 6 #define ATHENA_EXTENSIONS_CHROME_ATHENA_APP_DELEGATE_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" |
(...skipping 27 matching lines...) Expand all Loading... |
38 content::WebContents* web_contents, | 38 content::WebContents* web_contents, |
39 SkColor initial_color) OVERRIDE; | 39 SkColor initial_color) OVERRIDE; |
40 virtual void RunFileChooser( | 40 virtual void RunFileChooser( |
41 content::WebContents* tab, | 41 content::WebContents* tab, |
42 const content::FileChooserParams& params) OVERRIDE; | 42 const content::FileChooserParams& params) OVERRIDE; |
43 virtual void RequestMediaAccessPermission( | 43 virtual void RequestMediaAccessPermission( |
44 content::WebContents* web_contents, | 44 content::WebContents* web_contents, |
45 const content::MediaStreamRequest& request, | 45 const content::MediaStreamRequest& request, |
46 const content::MediaResponseCallback& callback, | 46 const content::MediaResponseCallback& callback, |
47 const extensions::Extension* extension) OVERRIDE; | 47 const extensions::Extension* extension) OVERRIDE; |
| 48 virtual bool CheckMediaAccessPermission( |
| 49 content::WebContents* web_contents, |
| 50 const GURL& security_origin, |
| 51 content::MediaStreamType type, |
| 52 const extensions::Extension* extension) OVERRIDE; |
48 virtual int PreferredIconSize() OVERRIDE; | 53 virtual int PreferredIconSize() OVERRIDE; |
49 virtual gfx::ImageSkia GetAppDefaultIcon() OVERRIDE; | 54 virtual gfx::ImageSkia GetAppDefaultIcon() OVERRIDE; |
50 virtual void SetWebContentsBlocked(content::WebContents* web_contents, | 55 virtual void SetWebContentsBlocked(content::WebContents* web_contents, |
51 bool blocked) OVERRIDE; | 56 bool blocked) OVERRIDE; |
52 virtual bool IsWebContentsVisible( | 57 virtual bool IsWebContentsVisible( |
53 content::WebContents* web_contents) OVERRIDE; | 58 content::WebContents* web_contents) OVERRIDE; |
54 virtual void SetTerminatingCallback(const base::Closure& callback) OVERRIDE; | 59 virtual void SetTerminatingCallback(const base::Closure& callback) OVERRIDE; |
55 | 60 |
56 scoped_ptr<NewWindowContentsDelegate> new_window_contents_delegate_; | 61 scoped_ptr<NewWindowContentsDelegate> new_window_contents_delegate_; |
57 base::Closure terminating_callback_; | 62 base::Closure terminating_callback_; |
58 | 63 |
59 DISALLOW_COPY_AND_ASSIGN(AthenaAppDelegate); | 64 DISALLOW_COPY_AND_ASSIGN(AthenaAppDelegate); |
60 }; | 65 }; |
61 | 66 |
62 } // namespace athena | 67 } // namespace athena |
63 | 68 |
64 #endif // ATHENA_EXTENSIONS_CHROME_ATHENA_APP_DELEGATE_H_ | 69 #endif // ATHENA_EXTENSIONS_CHROME_ATHENA_APP_DELEGATE_H_ |
OLD | NEW |