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 30942a34d1e4691c5d32ed532f159dbc27093bcf..e50a4e013cad165d34a6f7116567b8e0448731c2 100644 |
--- a/chrome/browser/guest_view/app_view/app_view_guest.cc |
+++ b/chrome/browser/guest_view/app_view/app_view_guest.cc |
@@ -8,7 +8,6 @@ |
#include "chrome/browser/extensions/extension_service.h" |
#include "chrome/browser/guest_view/app_view/app_view_constants.h" |
#include "chrome/browser/guest_view/guest_view_manager.h" |
-#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/renderer_context_menu/context_menu_delegate.h" |
#include "chrome/browser/renderer_context_menu/render_view_context_menu.h" |
#include "content/public/browser/render_view_host.h" |
@@ -127,9 +126,8 @@ bool AppViewGuest::HandleContextMenu(const content::ContextMenuParams& params) { |
bool AppViewGuest::CanEmbedderUseGuestView( |
const std::string& embedder_extension_id) { |
- Profile* profile = Profile::FromBrowserContext(browser_context()); |
ExtensionService* service = |
- extensions::ExtensionSystem::Get(profile)->extension_service(); |
+ extensions::ExtensionSystem::Get(browser_context())->extension_service(); |
const extensions::Extension* embedder_extension = |
service->GetExtensionById(embedder_extension_id, false); |
const extensions::PermissionsData* permissions_data = |
@@ -149,9 +147,8 @@ void AppViewGuest::CreateWebContents( |
return; |
} |
- Profile* profile = Profile::FromBrowserContext(browser_context()); |
ExtensionService* service = |
- extensions::ExtensionSystem::Get(profile)->extension_service(); |
+ extensions::ExtensionSystem::Get(browser_context())->extension_service(); |
const extensions::Extension* guest_extension = |
service->GetExtensionById(app_id, false); |
const extensions::Extension* embedder_extension = |
@@ -171,9 +168,10 @@ void AppViewGuest::CreateWebContents( |
callback)))); |
extensions::LazyBackgroundTaskQueue* queue = |
- extensions::ExtensionSystem::Get(profile)->lazy_background_task_queue(); |
- if (queue->ShouldEnqueueTask(profile, guest_extension)) { |
- queue->AddPendingTask(profile, |
+ extensions::ExtensionSystem::Get(browser_context())-> |
+ lazy_background_task_queue(); |
+ if (queue->ShouldEnqueueTask(browser_context(), guest_extension)) { |
+ queue->AddPendingTask(browser_context(), |
guest_extension->id(), |
base::Bind(&AppViewGuest::LaunchAppAndFireEvent, |
weak_ptr_factory_.GetWeakPtr(), |
@@ -182,7 +180,7 @@ void AppViewGuest::CreateWebContents( |
} |
extensions::ProcessManager* process_manager = |
- extensions::ExtensionSystem::Get(profile)->process_manager(); |
+ extensions::ExtensionSystem::Get(browser_context())->process_manager(); |
ExtensionHost* host = |
process_manager->GetBackgroundHostForExtension(guest_extension->id()); |
DCHECK(host); |
@@ -230,7 +228,6 @@ void AppViewGuest::CompleteCreateWebContents( |
void AppViewGuest::LaunchAppAndFireEvent( |
const WebContentsCreatedCallback& callback, |
ExtensionHost* extension_host) { |
- Profile* profile = Profile::FromBrowserContext(browser_context()); |
extensions::ExtensionSystem* system = |
extensions::ExtensionSystem::Get(browser_context()); |
bool has_event_listener = system->event_router()->ExtensionHasEventListener( |
@@ -245,6 +242,6 @@ void AppViewGuest::LaunchAppAndFireEvent( |
embed_request->SetInteger(appview::kGuestInstanceID, GetGuestInstanceID()); |
embed_request->SetString(appview::kEmbedderID, embedder_extension_id()); |
extensions::AppRuntimeEventRouter::DispatchOnEmbedRequestedEvent( |
- profile, embed_request.Pass(), extension_host->extension()); |
+ browser_context(), embed_request.Pass(), extension_host->extension()); |
} |