Index: chrome/browser/guest_view/web_view/web_view_guest.cc |
diff --git a/chrome/browser/guest_view/web_view/web_view_guest.cc b/chrome/browser/guest_view/web_view/web_view_guest.cc |
index 8ee9dcc596231ba8336bf8448b5b02b029fba101..e645524a12ed1c6a6d7a69efd9c2bead1a4911b9 100644 |
--- a/chrome/browser/guest_view/web_view/web_view_guest.cc |
+++ b/chrome/browser/guest_view/web_view/web_view_guest.cc |
@@ -48,10 +48,10 @@ |
#include "content/public/common/result_codes.h" |
#include "content/public/common/stop_find_action.h" |
#include "content/public/common/url_constants.h" |
-#include "extensions/browser/extension_registry.h" |
#include "extensions/browser/extension_system.h" |
#include "extensions/common/constants.h" |
-#include "extensions/common/permissions/permissions_data.h" |
+#include "extensions/common/features/feature.h" |
+#include "extensions/common/features/feature_provider.h" |
#include "ipc/ipc_message_macros.h" |
#include "net/base/escape.h" |
#include "net/base/net_errors.h" |
@@ -226,16 +226,9 @@ scoped_ptr<base::ListValue> WebViewGuest::MenuModelToValue( |
return items.Pass(); |
} |
-bool WebViewGuest::CanEmbedderUseGuestView( |
- const std::string& embedder_extension_id) { |
- const extensions::Extension* embedder_extension = |
- extensions::ExtensionRegistry::Get(browser_context()) |
- ->enabled_extensions() |
- .GetByID(embedder_extension_id); |
- if (!embedder_extension) |
- return false; |
- return embedder_extension->permissions_data()->HasAPIPermission( |
- extensions::APIPermission::kWebView); |
+extensions::Feature* WebViewGuest::GetFeature() { |
+ return extensions::FeatureProvider::GetAPIFeatures()->GetFeature( |
+ "webViewInternal"); |
} |
void WebViewGuest::CreateWebContents( |
@@ -574,9 +567,11 @@ void WebViewGuest::CreateNewGuestWebViewWindow( |
WebViewGuest::Type, |
embedder_extension_id(), |
embedder_web_contents()->GetRenderProcessHost()->GetID(), |
+ embedder_web_contents(), |
create_params, |
base::Bind(&WebViewGuest::NewGuestWebViewCallback, |
- base::Unretained(this), params)); |
+ base::Unretained(this), |
+ params)); |
} |
void WebViewGuest::NewGuestWebViewCallback( |