diff options
| author | afakhry <afakhry@chromium.org> | 2015-08-03 12:38:03 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-03 19:38:41 +0000 |
| commit | b662e1c8ff3e2ec8d796920ca6929bdbb0a7b329 (patch) | |
| tree | 4e73e204f12e3eef5ae243fac421909c303333a2 /extensions/browser/guest_view/web_view | |
| parent | 5087842b0c12776ce31876754346dc65c2382037 (diff) | |
| download | chromium_src-b662e1c8ff3e2ec8d796920ca6929bdbb0a7b329.zip chromium_src-b662e1c8ff3e2ec8d796920ca6929bdbb0a7b329.tar.gz chromium_src-b662e1c8ff3e2ec8d796920ca6929bdbb0a7b329.tar.bz2 | |
New Task Manager - Phase 1.3.3: Implement Guest Task Providing
Add support for the browser plugin guests that represent <*view> tags so
that they show up in the task manager.
CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_site_isolation
R=nick@chromium.org
BUG=470991
TEST=browser_tests --gtest_filter=WebViewTest.TaskManagement*
Review URL: https://codereview.chromium.org/1242993002
Cr-Commit-Position: refs/heads/master@{#341588}
Diffstat (limited to 'extensions/browser/guest_view/web_view')
| -rw-r--r-- | extensions/browser/guest_view/web_view/web_view_apitest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/extensions/browser/guest_view/web_view/web_view_apitest.cc b/extensions/browser/guest_view/web_view/web_view_apitest.cc index 0e1b24e..5857b73 100644 --- a/extensions/browser/guest_view/web_view/web_view_apitest.cc +++ b/extensions/browser/guest_view/web_view/web_view_apitest.cc @@ -9,6 +9,7 @@ #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "components/guest_view/browser/guest_view_manager.h" +#include "components/guest_view/browser/guest_view_manager_delegate.h" #include "components/guest_view/browser/guest_view_manager_factory.h" #include "components/guest_view/browser/test_guest_view_manager.h" #include "content/public/browser/render_process_host.h" @@ -16,11 +17,10 @@ #include "content/public/test/browser_test_utils.h" #include "content/public/test/test_renderer_host.h" #include "content/public/test/test_utils.h" +#include "extensions/browser/api/extensions_api_client.h" #include "extensions/browser/api/test/test_api.h" #include "extensions/browser/app_window/app_window.h" #include "extensions/browser/app_window/app_window_registry.h" -#include "extensions/browser/extension_host.h" -#include "extensions/browser/guest_view/extensions_guest_view_manager_delegate.h" #include "extensions/browser/process_manager.h" #include "extensions/common/extension.h" #include "extensions/common/extension_paths.h" @@ -255,11 +255,11 @@ TestGuestViewManager* WebViewAPITest::GetGuestViewManager() { // TestGuestViewManager::WaitForSingleGuestCreated may and will get called // before a guest is created. if (!manager) { - manager = static_cast<TestGuestViewManager*>( - GuestViewManager::CreateWithDelegate( + manager = + static_cast<TestGuestViewManager*>(GuestViewManager::CreateWithDelegate( context, - scoped_ptr<guest_view::GuestViewManagerDelegate>( - new ExtensionsGuestViewManagerDelegate(context)))); + ExtensionsAPIClient::Get()->CreateGuestViewManagerDelegate( + context))); } return manager; } |