extensions/browser/guest_view/surface_worker/surface_worker_guest.cc - Issue 1066563006: GuestView: Move GuestViewManager extension dependencies to ExtensionsGuestViewManagerDelegate

Side by Side Diff: extensions/browser/guest_view/surface_worker/surface_worker_guest.cc

Issue 1066563006: GuestView: Move GuestViewManager extension dependencies to ExtensionsGuestViewManagerDelegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@extensions_guest_view_message_filter

Patch Set: Fixed tests I hope Created 5 years, 8 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

« extensions/browser/guest_view/guest_view_event.cc ('K') | « extensions/browser/guest_view/guest_view_message_filter.cc ('k') | extensions/browser/guest_view/test_guest_view_manager.h » ('j') | extensions/browser/guest_view/web_view/web_view_apitest.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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/surface_worker/surface_worker_guest.h"	5 #include "extensions/browser/guest_view/surface_worker/surface_worker_guest.h"

6	6

7 #include "content/public/common/url_constants.h"	7 #include "content/public/common/url_constants.h"

8 #include "extensions/browser/guest_view/guest_view_manager.h"	8 #include "extensions/browser/guest_view/guest_view_manager.h"

9 #include "extensions/browser/guest_view/surface_worker/surface_worker_constants. h"	9 #include "extensions/browser/guest_view/surface_worker/surface_worker_constants. h"

10 #include "extensions/strings/grit/extensions_strings.h"	10 #include "extensions/strings/grit/extensions_strings.h"

(...skipping 47 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
58 url_ = GURL(url);	58 url_ = GURL(url);

59 if (!url_.is_valid()) {	59 if (!url_.is_valid()) {

60 callback.Run(NULL);	60 callback.Run(NULL);

61 return;	61 return;

62 }	62 }

63	63

64 GURL guest_site(base::StringPrintf("%s://surface-%s",	64 GURL guest_site(base::StringPrintf("%s://surface-%s",

65 content::kGuestScheme,	65 content::kGuestScheme,

66 GetOwnerSiteURL().host().c_str()));	66 GetOwnerSiteURL().host().c_str()));

67	67

68 GuestViewManager* guest_view_manager =	68 GuestViewManager* guest_view_manager = GuestViewManager::FromBrowserContext(

69 GuestViewManager::FromBrowserContextIfAvailable(	69 owner_web_contents()->GetBrowserContext());

70 owner_web_contents()->GetBrowserContext());

71 content::SiteInstance* guest_site_instance =	70 content::SiteInstance* guest_site_instance =

72 guest_view_manager->GetGuestSiteInstance(guest_site);	71 guest_view_manager->GetGuestSiteInstance(guest_site);

73 WebContents::CreateParams params(	72 WebContents::CreateParams params(

74 owner_web_contents()->GetBrowserContext(),	73 owner_web_contents()->GetBrowserContext(),

75 guest_site_instance);	74 guest_site_instance);

76 params.guest_delegate = this;	75 params.guest_delegate = this;

77 callback.Run(WebContents::Create(params));	76 callback.Run(WebContents::Create(params));

78 }	77 }

79	78

80 void SurfaceWorkerGuest::DidAttachToEmbedder() {	79 void SurfaceWorkerGuest::DidAttachToEmbedder() {

81 web_contents()->GetController().LoadURL(	80 web_contents()->GetController().LoadURL(

82 url_, content::Referrer(), ui::PAGE_TRANSITION_LINK, std::string());	81 url_, content::Referrer(), ui::PAGE_TRANSITION_LINK, std::string());

83 url_ = GURL();	82 url_ = GURL();

84 }	83 }

85	84

86 } // namespace extensions	85 } // namespace extensions

OLD	NEW