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

Side by Side Diff: extensions/browser/guest_view/extensions_guest_view_manager_delegate.cc

Issue 2241203003: Pass user session type to extension feature checks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: split out some stuff Created 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "extensions/browser/guest_view/extensions_guest_view_manager_delegate.h " 5 #include "extensions/browser/guest_view/extensions_guest_view_manager_delegate.h "
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "components/guest_view/browser/guest_view_base.h" 9 #include "components/guest_view/browser/guest_view_base.h"
10 #include "components/guest_view/browser/guest_view_manager.h" 10 #include "components/guest_view/browser/guest_view_manager.h"
11 #include "components/guest_view/common/guest_view_constants.h" 11 #include "components/guest_view/common/guest_view_constants.h"
12 #include "content/public/browser/browser_context.h" 12 #include "content/public/browser/browser_context.h"
13 #include "content/public/browser/render_process_host.h" 13 #include "content/public/browser/render_process_host.h"
14 #include "extensions/browser/api/extensions_api_client.h" 14 #include "extensions/browser/api/extensions_api_client.h"
15 #include "extensions/browser/event_router.h" 15 #include "extensions/browser/event_router.h"
16 #include "extensions/browser/extension_util.h"
16 #include "extensions/browser/guest_view/app_view/app_view_guest.h" 17 #include "extensions/browser/guest_view/app_view/app_view_guest.h"
17 #include "extensions/browser/guest_view/extension_options/extension_options_gues t.h" 18 #include "extensions/browser/guest_view/extension_options/extension_options_gues t.h"
18 #include "extensions/browser/guest_view/extension_view/extension_view_guest.h" 19 #include "extensions/browser/guest_view/extension_view/extension_view_guest.h"
19 #include "extensions/browser/guest_view/guest_view_events.h" 20 #include "extensions/browser/guest_view/guest_view_events.h"
20 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_gues t.h" 21 #include "extensions/browser/guest_view/mime_handler_view/mime_handler_view_gues t.h"
21 #include "extensions/browser/guest_view/web_view/web_view_guest.h" 22 #include "extensions/browser/guest_view/web_view/web_view_guest.h"
22 #include "extensions/browser/process_manager.h" 23 #include "extensions/browser/process_manager.h"
23 #include "extensions/browser/process_map.h" 24 #include "extensions/browser/process_map.h"
24 #include "extensions/common/features/feature.h" 25 #include "extensions/common/features/feature.h"
25 #include "extensions/common/features/feature_provider.h" 26 #include "extensions/common/features/feature_provider.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 76
76 const Extension* owner_extension = ProcessManager::Get(context_)-> 77 const Extension* owner_extension = ProcessManager::Get(context_)->
77 GetExtensionForWebContents(guest->owner_web_contents()); 78 GetExtensionForWebContents(guest->owner_web_contents());
78 79
79 // Ok for |owner_extension| to be nullptr, the embedder might be WebUI. 80 // Ok for |owner_extension| to be nullptr, the embedder might be WebUI.
80 Feature::Availability availability = feature->IsAvailableToContext( 81 Feature::Availability availability = feature->IsAvailableToContext(
81 owner_extension, 82 owner_extension,
82 process_map->GetMostLikelyContextType( 83 process_map->GetMostLikelyContextType(
83 owner_extension, 84 owner_extension,
84 guest->owner_web_contents()->GetRenderProcessHost()->GetID()), 85 guest->owner_web_contents()->GetRenderProcessHost()->GetID()),
85 guest->GetOwnerSiteURL()); 86 util::GetCurrentSessionType(), guest->GetOwnerSiteURL());
86 87
87 return availability.is_available(); 88 return availability.is_available();
88 } 89 }
89 90
90 bool ExtensionsGuestViewManagerDelegate::IsOwnedByExtension( 91 bool ExtensionsGuestViewManagerDelegate::IsOwnedByExtension(
91 GuestViewBase* guest) { 92 GuestViewBase* guest) {
92 return !!ProcessManager::Get(context_)-> 93 return !!ProcessManager::Get(context_)->
93 GetExtensionForWebContents(guest->owner_web_contents()); 94 GetExtensionForWebContents(guest->owner_web_contents());
94 } 95 }
95 96
96 void ExtensionsGuestViewManagerDelegate::RegisterAdditionalGuestViewTypes() { 97 void ExtensionsGuestViewManagerDelegate::RegisterAdditionalGuestViewTypes() {
97 GuestViewManager* manager = GuestViewManager::FromBrowserContext(context_); 98 GuestViewManager* manager = GuestViewManager::FromBrowserContext(context_);
98 manager->RegisterGuestViewType<AppViewGuest>(); 99 manager->RegisterGuestViewType<AppViewGuest>();
99 manager->RegisterGuestViewType<ExtensionOptionsGuest>(); 100 manager->RegisterGuestViewType<ExtensionOptionsGuest>();
100 manager->RegisterGuestViewType<ExtensionViewGuest>(); 101 manager->RegisterGuestViewType<ExtensionViewGuest>();
101 manager->RegisterGuestViewType<MimeHandlerViewGuest>(); 102 manager->RegisterGuestViewType<MimeHandlerViewGuest>();
102 manager->RegisterGuestViewType<WebViewGuest>(); 103 manager->RegisterGuestViewType<WebViewGuest>();
103 } 104 }
104 105
105 } // namespace extensions 106 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698