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 #include "extensions/browser/guest_view/test_guest_view_manager.h" | 5 #include "extensions/browser/guest_view/test_guest_view_manager.h" |
6 | 6 |
7 #include "base/callback.h" | 7 #include "base/callback.h" |
8 #include "base/strings/stringprintf.h" | 8 #include "base/strings/stringprintf.h" |
9 #include "content/public/test/browser_test_utils.h" | 9 #include "content/public/test/browser_test_utils.h" |
10 #include "extensions/browser/app_window/app_window.h" | 10 #include "extensions/browser/app_window/app_window.h" |
11 #include "extensions/browser/app_window/app_window_registry.h" | 11 #include "extensions/browser/app_window/app_window_registry.h" |
12 #include "extensions/browser/extension_host.h" | 12 #include "extensions/browser/extension_host.h" |
| 13 #include "extensions/browser/guest_view/extensions_guest_view_manager_delegate.h
" |
13 #include "extensions/browser/process_manager.h" | 14 #include "extensions/browser/process_manager.h" |
14 #include "extensions/common/extension.h" | 15 #include "extensions/common/extension.h" |
15 #include "extensions/common/extension_paths.h" | 16 #include "extensions/common/extension_paths.h" |
16 #include "extensions/shell/browser/shell_extension_system.h" | 17 #include "extensions/shell/browser/shell_extension_system.h" |
17 #include "extensions/shell/test/shell_test.h" | 18 #include "extensions/shell/test/shell_test.h" |
18 #include "extensions/test/extension_test_message_listener.h" | 19 #include "extensions/test/extension_test_message_listener.h" |
19 | 20 |
| 21 using guestview::GuestViewManagerDelegate; |
| 22 |
20 namespace extensions { | 23 namespace extensions { |
21 | 24 |
22 TestGuestViewManager::TestGuestViewManager(content::BrowserContext* context) | 25 TestGuestViewManager::TestGuestViewManager( |
23 : GuestViewManager(context) { | 26 content::BrowserContext* context, |
| 27 scoped_ptr<GuestViewManagerDelegate> delegate) |
| 28 : GuestViewManager(context, delegate.Pass()) { |
24 } | 29 } |
25 | 30 |
26 TestGuestViewManager::~TestGuestViewManager() { | 31 TestGuestViewManager::~TestGuestViewManager() { |
27 } | 32 } |
28 | 33 |
29 int TestGuestViewManager::GetNumGuests() const { | 34 int TestGuestViewManager::GetNumGuests() const { |
30 return guest_web_contents_by_instance_id_.size(); | 35 return guest_web_contents_by_instance_id_.size(); |
31 } | 36 } |
32 | 37 |
33 content::WebContents* TestGuestViewManager::GetLastGuestCreated() { | 38 content::WebContents* TestGuestViewManager::GetLastGuestCreated() { |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
87 content::BrowserContext* context) { | 92 content::BrowserContext* context) { |
88 return GetManager(context); | 93 return GetManager(context); |
89 } | 94 } |
90 | 95 |
91 // This function gets called from GuestViewManager::FromBrowserContext(), | 96 // This function gets called from GuestViewManager::FromBrowserContext(), |
92 // where test_guest_view_manager_ is assigned to a linked_ptr that takes care | 97 // where test_guest_view_manager_ is assigned to a linked_ptr that takes care |
93 // of deleting it. | 98 // of deleting it. |
94 TestGuestViewManager* TestGuestViewManagerFactory::GetManager( | 99 TestGuestViewManager* TestGuestViewManagerFactory::GetManager( |
95 content::BrowserContext* context) { | 100 content::BrowserContext* context) { |
96 DCHECK(!test_guest_view_manager_); | 101 DCHECK(!test_guest_view_manager_); |
97 test_guest_view_manager_ = new TestGuestViewManager(context); | 102 test_guest_view_manager_ = new TestGuestViewManager( |
| 103 context, |
| 104 scoped_ptr<guestview::GuestViewManagerDelegate>( |
| 105 new ExtensionsGuestViewManagerDelegate(context))); |
98 return test_guest_view_manager_; | 106 return test_guest_view_manager_; |
99 } | 107 } |
100 | 108 |
101 } // namespace extensions | 109 } // namespace extensions |
OLD | NEW |