Chromium Code Reviews| Index: chrome/browser/guest_view/app_view/app_view_guest.cc |
| diff --git a/chrome/browser/guest_view/app_view/app_view_guest.cc b/chrome/browser/guest_view/app_view/app_view_guest.cc |
| index 85e9d52d2bb21a3270dc4071b18a0388615d0af8..06dd43bc65f32769365fd486f7bf5115a587759c 100644 |
| --- a/chrome/browser/guest_view/app_view/app_view_guest.cc |
| +++ b/chrome/browser/guest_view/app_view/app_view_guest.cc |
| @@ -17,13 +17,13 @@ |
| #include "extensions/browser/api/app_runtime/app_runtime_api.h" |
| #include "extensions/browser/event_router.h" |
| #include "extensions/browser/extension_host.h" |
| -#include "extensions/browser/extension_registry.h" |
| #include "extensions/browser/extension_system.h" |
| #include "extensions/browser/lazy_background_task_queue.h" |
| #include "extensions/browser/view_type_utils.h" |
| #include "extensions/common/api/app_runtime.h" |
| #include "extensions/common/extension_messages.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" |
| namespace app_runtime = extensions::core_api::app_runtime; |
| @@ -137,16 +137,9 @@ bool AppViewGuest::HandleContextMenu(const content::ContextMenuParams& params) { |
| return true; |
| } |
| -bool AppViewGuest::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::kAppView); |
| +extensions::Feature* AppViewGuest::GetFeature() { |
| + return extensions::FeatureProvider::GetAPIFeatures()->GetFeature( |
| + "appViewInternal"); |
|
not at google - send to devlin
2014/08/07 00:25:29
I'll define symbolic constants for each of these "
|
| } |
| void AppViewGuest::CreateWebContents( |