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

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

Issue 820513002: Renamed WorkerFrame to SurfaceWorker (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed tests Created 6 years 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 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/worker_frame/worker_frame_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/worker_frame/worker_frame_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"
11 #include "ipc/ipc_message_macros.h" 11 #include "ipc/ipc_message_macros.h"
12 12
13 using content::RenderFrameHost; 13 using content::RenderFrameHost;
14 using content::WebContents; 14 using content::WebContents;
15 15
16 namespace extensions { 16 namespace extensions {
17 17
18 // static. 18 // static.
19 const char WorkerFrameGuest::Type[] = "workerframe"; 19 const char SurfaceWorkerGuest::Type[] = "surfaceview";
20 20
21 // static 21 // static
22 GuestViewBase* WorkerFrameGuest::Create( 22 GuestViewBase* SurfaceWorkerGuest::Create(
23 content::BrowserContext* browser_context, 23 content::BrowserContext* browser_context,
24 content::WebContents* owner_web_contents, 24 content::WebContents* owner_web_contents,
25 int guest_instance_id) { 25 int guest_instance_id) {
26 return new WorkerFrameGuest(browser_context, 26 return new SurfaceWorkerGuest(browser_context,
27 owner_web_contents, 27 owner_web_contents,
28 guest_instance_id); 28 guest_instance_id);
29 } 29 }
30 30
31 WorkerFrameGuest::WorkerFrameGuest( 31 SurfaceWorkerGuest::SurfaceWorkerGuest(
32 content::BrowserContext* browser_context, 32 content::BrowserContext* browser_context,
33 content::WebContents* owner_web_contents, 33 content::WebContents* owner_web_contents,
34 int guest_instance_id) 34 int guest_instance_id)
35 : GuestView<WorkerFrameGuest>(browser_context, 35 : GuestView<SurfaceWorkerGuest>(browser_context,
36 owner_web_contents, 36 owner_web_contents,
37 guest_instance_id), 37 guest_instance_id),
38 weak_ptr_factory_(this) { 38 weak_ptr_factory_(this) {
39 } 39 }
40 40
41 WorkerFrameGuest::~WorkerFrameGuest() { 41 SurfaceWorkerGuest::~SurfaceWorkerGuest() {
42 } 42 }
43 43
44 bool WorkerFrameGuest::HandleContextMenu( 44 bool SurfaceWorkerGuest::HandleContextMenu(
45 const content::ContextMenuParams& params) { 45 const content::ContextMenuParams& params) {
46 return false; 46 return false;
47 } 47 }
48 48
49 const char* WorkerFrameGuest::GetAPINamespace() const { 49 const char* SurfaceWorkerGuest::GetAPINamespace() const {
50 return worker_frame::kEmbedderAPINamespace; 50 return surface_worker::kEmbedderAPINamespace;
51 } 51 }
52 52
53 int WorkerFrameGuest::GetTaskPrefix() const { 53 int SurfaceWorkerGuest::GetTaskPrefix() const {
54 return IDS_EXTENSION_TASK_MANAGER_WORKER_FRAME_TAG_PREFIX; 54 return IDS_EXTENSION_TASK_MANAGER_SURFACEWORKER_TAG_PREFIX;
55 } 55 }
56 56
57 void WorkerFrameGuest::CreateWebContents( 57 void SurfaceWorkerGuest::CreateWebContents(
58 const base::DictionaryValue& create_params, 58 const base::DictionaryValue& create_params,
59 const WebContentsCreatedCallback& callback) { 59 const WebContentsCreatedCallback& callback) {
60 std::string url; 60 std::string url;
61 if (!create_params.GetString(worker_frame::kURL, &url)) { 61 if (!create_params.GetString(surface_worker::kURL, &url)) {
62 callback.Run(NULL); 62 callback.Run(NULL);
63 return; 63 return;
64 } 64 }
65 65
66 url_ = GURL(url); 66 url_ = GURL(url);
67 if (!url_.is_valid()) { 67 if (!url_.is_valid()) {
68 callback.Run(NULL); 68 callback.Run(NULL);
69 return; 69 return;
70 } 70 }
71 71
72 GURL guest_site(base::StringPrintf("%s://wtf-%s", 72 GURL guest_site(base::StringPrintf("%s://surface-%s",
73 content::kGuestScheme, 73 content::kGuestScheme,
74 GetOwnerSiteURL().host().c_str())); 74 GetOwnerSiteURL().host().c_str()));
75 75
76 GuestViewManager* guest_view_manager = 76 GuestViewManager* guest_view_manager =
77 GuestViewManager::FromBrowserContext( 77 GuestViewManager::FromBrowserContext(
78 owner_web_contents()->GetBrowserContext()); 78 owner_web_contents()->GetBrowserContext());
79 content::SiteInstance* guest_site_instance = 79 content::SiteInstance* guest_site_instance =
80 guest_view_manager->GetGuestSiteInstance(guest_site); 80 guest_view_manager->GetGuestSiteInstance(guest_site);
81 WebContents::CreateParams params( 81 WebContents::CreateParams params(
82 owner_web_contents()->GetBrowserContext(), 82 owner_web_contents()->GetBrowserContext(),
83 guest_site_instance); 83 guest_site_instance);
84 params.guest_delegate = this; 84 params.guest_delegate = this;
85 callback.Run(WebContents::Create(params)); 85 callback.Run(WebContents::Create(params));
86 } 86 }
87 87
88 void WorkerFrameGuest::DidAttachToEmbedder() { 88 void SurfaceWorkerGuest::DidAttachToEmbedder() {
89 web_contents()->GetController().LoadURL( 89 web_contents()->GetController().LoadURL(
90 url_, content::Referrer(), ui::PAGE_TRANSITION_LINK, std::string()); 90 url_, content::Referrer(), ui::PAGE_TRANSITION_LINK, std::string());
91 url_ = GURL(); 91 url_ = GURL();
92 } 92 }
93 93
94 } // namespace extensions 94 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698