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

Unified Diff: chrome/browser/extensions/api/chrome_extensions_api_client.cc

Issue 505893002: Revert of Move core web_view code to extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/chrome_extensions_api_client.cc
diff --git a/chrome/browser/extensions/api/chrome_extensions_api_client.cc b/chrome/browser/extensions/api/chrome_extensions_api_client.cc
index c15c1df7aab1490e6ff4690c7f0c3369f742dc75..8f600c51ec9904e33e22d03f0e72c267efe4f03f 100644
--- a/chrome/browser/extensions/api/chrome_extensions_api_client.cc
+++ b/chrome/browser/extensions/api/chrome_extensions_api_client.cc
@@ -8,14 +8,11 @@
#include "chrome/browser/extensions/api/storage/sync_value_store_cache.h"
#include "chrome/browser/guest_view/app_view/chrome_app_view_guest_delegate.h"
#include "chrome/browser/guest_view/extension_options/extension_options_guest.h"
-#include "chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.h"
-#include "chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.h"
+#include "chrome/browser/guest_view/web_view/web_view_guest.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
#include "device/hid/hid_service.h"
#include "extensions/browser/guest_view/app_view/app_view_guest.h"
-#include "extensions/browser/guest_view/web_view/web_view_guest.h"
-#include "extensions/browser/guest_view/web_view/web_view_permission_helper.h"
#if defined(ENABLE_CONFIGURATION_POLICY)
#include "chrome/browser/extensions/api/storage/managed_value_store_cache.h"
@@ -69,17 +66,6 @@
return new ChromeAppViewGuestDelegate();
}
-WebViewGuestDelegate* ChromeExtensionsAPIClient::CreateWebViewGuestDelegate(
- WebViewGuest* web_view_guest) const {
- return new ChromeWebViewGuestDelegate(web_view_guest);
-}
-
-WebViewPermissionHelperDelegate* ChromeExtensionsAPIClient::
- CreateWebViewPermissionHelperDelegate(
- WebViewPermissionHelper* web_view_permission_helper) const {
- return new ChromeWebViewPermissionHelperDelegate(web_view_permission_helper);
-}
-
device::HidService* ChromeExtensionsAPIClient::GetHidService() {
if (!hid_service_) {
hid_service_.reset(device::HidService::Create(
@@ -90,7 +76,9 @@
}
void ChromeExtensionsAPIClient::RegisterGuestViewTypes() {
+ AppViewGuest::Register();
ExtensionOptionsGuest::Register();
+ WebViewGuest::Register();
}
} // namespace extensions

Powered by Google App Engine
This is Rietveld 408576698