| 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 EXTENSIONS_BROWSER_GUEST_VIEW_APP_VIEW_APP_VIEW_GUEST_H_ | 5 #ifndef EXTENSIONS_BROWSER_GUEST_VIEW_APP_VIEW_APP_VIEW_GUEST_H_ |
| 6 #define EXTENSIONS_BROWSER_GUEST_VIEW_APP_VIEW_APP_VIEW_GUEST_H_ | 6 #define EXTENSIONS_BROWSER_GUEST_VIEW_APP_VIEW_APP_VIEW_GUEST_H_ |
| 7 | 7 |
| 8 #include "base/id_map.h" | 8 #include "base/id_map.h" |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "components/guest_view/browser/guest_view.h" | 10 #include "components/guest_view/browser/guest_view.h" |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 const content::MediaStreamRequest& request, | 65 const content::MediaStreamRequest& request, |
| 66 const content::MediaResponseCallback& callback) final; | 66 const content::MediaResponseCallback& callback) final; |
| 67 bool CheckMediaAccessPermission(content::WebContents* web_contents, | 67 bool CheckMediaAccessPermission(content::WebContents* web_contents, |
| 68 const GURL& security_origin, | 68 const GURL& security_origin, |
| 69 content::MediaStreamType type) final; | 69 content::MediaStreamType type) final; |
| 70 | 70 |
| 71 void CompleteCreateWebContents(const GURL& url, | 71 void CompleteCreateWebContents(const GURL& url, |
| 72 const Extension* guest_extension, | 72 const Extension* guest_extension, |
| 73 const WebContentsCreatedCallback& callback); | 73 const WebContentsCreatedCallback& callback); |
| 74 | 74 |
| 75 void LaunchAppAndFireEvent(scoped_ptr<base::DictionaryValue> data, | 75 void LaunchAppAndFireEvent(std::unique_ptr<base::DictionaryValue> data, |
| 76 const WebContentsCreatedCallback& callback, | 76 const WebContentsCreatedCallback& callback, |
| 77 ExtensionHost* extension_host); | 77 ExtensionHost* extension_host); |
| 78 | 78 |
| 79 GURL url_; | 79 GURL url_; |
| 80 std::string guest_extension_id_; | 80 std::string guest_extension_id_; |
| 81 scoped_ptr<AppViewGuestDelegate> app_view_guest_delegate_; | 81 std::unique_ptr<AppViewGuestDelegate> app_view_guest_delegate_; |
| 82 scoped_ptr<AppDelegate> app_delegate_; | 82 std::unique_ptr<AppDelegate> app_delegate_; |
| 83 | 83 |
| 84 // This is used to ensure pending tasks will not fire after this object is | 84 // This is used to ensure pending tasks will not fire after this object is |
| 85 // destroyed. | 85 // destroyed. |
| 86 base::WeakPtrFactory<AppViewGuest> weak_ptr_factory_; | 86 base::WeakPtrFactory<AppViewGuest> weak_ptr_factory_; |
| 87 | 87 |
| 88 DISALLOW_COPY_AND_ASSIGN(AppViewGuest); | 88 DISALLOW_COPY_AND_ASSIGN(AppViewGuest); |
| 89 }; | 89 }; |
| 90 | 90 |
| 91 } // namespace extensions | 91 } // namespace extensions |
| 92 | 92 |
| 93 #endif // EXTENSIONS_BROWSER_GUEST_VIEW_APP_VIEW_APP_VIEW_GUEST_H_ | 93 #endif // EXTENSIONS_BROWSER_GUEST_VIEW_APP_VIEW_APP_VIEW_GUEST_H_ |
| OLD | NEW |