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

Unified Diff: chrome/browser/guest_view/app_view/app_view_guest.cc

Issue 408893002: Cleanup WebViewGuest::CanEmbedderAccessGuestView and AppViewGuest::CanEmbedderAccessGuestView (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_unnecessary_profile_usage
Patch Set: Created 6 years, 5 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
« no previous file with comments | « no previous file | chrome/browser/guest_view/web_view/web_view_guest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 e50a4e013cad165d34a6f7116567b8e0448731c2..ffdbc1015ef375beb79483947d7b414145f97faf 100644
--- a/chrome/browser/guest_view/app_view/app_view_guest.cc
+++ b/chrome/browser/guest_view/app_view/app_view_guest.cc
@@ -15,6 +15,7 @@
#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"
@@ -126,13 +127,13 @@ bool AppViewGuest::HandleContextMenu(const content::ContextMenuParams& params) {
bool AppViewGuest::CanEmbedderUseGuestView(
const std::string& embedder_extension_id) {
- ExtensionService* service =
- extensions::ExtensionSystem::Get(browser_context())->extension_service();
const extensions::Extension* embedder_extension =
- service->GetExtensionById(embedder_extension_id, false);
- const extensions::PermissionsData* permissions_data =
- embedder_extension->permissions_data();
- return permissions_data->HasAPIPermission(
+ 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);
}
« no previous file with comments | « no previous file | chrome/browser/guest_view/web_view/web_view_guest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698