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

Side by Side Diff: chrome/browser/guest_view/app_view/app_view_guest.cc

Issue 409663002: Remove unnecessary profile usage in AppViewGuest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove usage of Profile 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chrome/browser/guest_view/app_view/app_view_guest.h" 5 #include "chrome/browser/guest_view/app_view/app_view_guest.h"
6 6
7 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" 7 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
8 #include "chrome/browser/extensions/extension_service.h" 8 #include "chrome/browser/extensions/extension_service.h"
9 #include "chrome/browser/guest_view/app_view/app_view_constants.h" 9 #include "chrome/browser/guest_view/app_view/app_view_constants.h"
10 #include "chrome/browser/guest_view/guest_view_manager.h" 10 #include "chrome/browser/guest_view/guest_view_manager.h"
11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/renderer_context_menu/context_menu_delegate.h" 11 #include "chrome/browser/renderer_context_menu/context_menu_delegate.h"
13 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" 12 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h"
14 #include "content/public/browser/render_view_host.h" 13 #include "content/public/browser/render_view_host.h"
15 #include "content/public/common/renderer_preferences.h" 14 #include "content/public/common/renderer_preferences.h"
16 #include "extensions/browser/api/app_runtime/app_runtime_api.h" 15 #include "extensions/browser/api/app_runtime/app_runtime_api.h"
17 #include "extensions/browser/event_router.h" 16 #include "extensions/browser/event_router.h"
18 #include "extensions/browser/extension_host.h" 17 #include "extensions/browser/extension_host.h"
19 #include "extensions/browser/extension_system.h" 18 #include "extensions/browser/extension_system.h"
20 #include "extensions/browser/lazy_background_task_queue.h" 19 #include "extensions/browser/lazy_background_task_queue.h"
21 #include "extensions/browser/view_type_utils.h" 20 #include "extensions/browser/view_type_utils.h"
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 DCHECK(menu_delegate); 119 DCHECK(menu_delegate);
121 120
122 scoped_ptr<RenderViewContextMenu> menu = 121 scoped_ptr<RenderViewContextMenu> menu =
123 menu_delegate->BuildMenu(guest_web_contents(), params); 122 menu_delegate->BuildMenu(guest_web_contents(), params);
124 menu_delegate->ShowMenu(menu.Pass()); 123 menu_delegate->ShowMenu(menu.Pass());
125 return true; 124 return true;
126 } 125 }
127 126
128 bool AppViewGuest::CanEmbedderUseGuestView( 127 bool AppViewGuest::CanEmbedderUseGuestView(
129 const std::string& embedder_extension_id) { 128 const std::string& embedder_extension_id) {
130 Profile* profile = Profile::FromBrowserContext(browser_context());
131 ExtensionService* service = 129 ExtensionService* service =
132 extensions::ExtensionSystem::Get(profile)->extension_service(); 130 extensions::ExtensionSystem::Get(browser_context())->extension_service();
133 const extensions::Extension* embedder_extension = 131 const extensions::Extension* embedder_extension =
134 service->GetExtensionById(embedder_extension_id, false); 132 service->GetExtensionById(embedder_extension_id, false);
135 const extensions::PermissionsData* permissions_data = 133 const extensions::PermissionsData* permissions_data =
136 embedder_extension->permissions_data(); 134 embedder_extension->permissions_data();
137 return permissions_data->HasAPIPermission( 135 return permissions_data->HasAPIPermission(
138 extensions::APIPermission::kAppView); 136 extensions::APIPermission::kAppView);
139 } 137 }
140 138
141 void AppViewGuest::CreateWebContents( 139 void AppViewGuest::CreateWebContents(
142 const std::string& embedder_extension_id, 140 const std::string& embedder_extension_id,
143 int embedder_render_process_id, 141 int embedder_render_process_id,
144 const base::DictionaryValue& create_params, 142 const base::DictionaryValue& create_params,
145 const WebContentsCreatedCallback& callback) { 143 const WebContentsCreatedCallback& callback) {
146 std::string app_id; 144 std::string app_id;
147 if (!create_params.GetString(appview::kAppID, &app_id)) { 145 if (!create_params.GetString(appview::kAppID, &app_id)) {
148 callback.Run(NULL); 146 callback.Run(NULL);
149 return; 147 return;
150 } 148 }
151 149
152 Profile* profile = Profile::FromBrowserContext(browser_context());
153 ExtensionService* service = 150 ExtensionService* service =
154 extensions::ExtensionSystem::Get(profile)->extension_service(); 151 extensions::ExtensionSystem::Get(browser_context())->extension_service();
155 const extensions::Extension* guest_extension = 152 const extensions::Extension* guest_extension =
156 service->GetExtensionById(app_id, false); 153 service->GetExtensionById(app_id, false);
157 const extensions::Extension* embedder_extension = 154 const extensions::Extension* embedder_extension =
158 service->GetExtensionById(embedder_extension_id, false); 155 service->GetExtensionById(embedder_extension_id, false);
159 156
160 if (!guest_extension || !guest_extension->is_platform_app() || 157 if (!guest_extension || !guest_extension->is_platform_app() ||
161 !embedder_extension | !embedder_extension->is_platform_app()) { 158 !embedder_extension | !embedder_extension->is_platform_app()) {
162 callback.Run(NULL); 159 callback.Run(NULL);
163 return; 160 return;
164 } 161 }
165 162
166 pending_response_map.Get().insert( 163 pending_response_map.Get().insert(
167 std::make_pair(GetGuestInstanceID(), 164 std::make_pair(GetGuestInstanceID(),
168 make_linked_ptr(new ResponseInfo( 165 make_linked_ptr(new ResponseInfo(
169 guest_extension, 166 guest_extension,
170 weak_ptr_factory_.GetWeakPtr(), 167 weak_ptr_factory_.GetWeakPtr(),
171 callback)))); 168 callback))));
172 169
173 extensions::LazyBackgroundTaskQueue* queue = 170 extensions::LazyBackgroundTaskQueue* queue =
174 extensions::ExtensionSystem::Get(profile)->lazy_background_task_queue(); 171 extensions::ExtensionSystem::Get(browser_context())->
175 if (queue->ShouldEnqueueTask(profile, guest_extension)) { 172 lazy_background_task_queue();
176 queue->AddPendingTask(profile, 173 if (queue->ShouldEnqueueTask(browser_context(), guest_extension)) {
174 queue->AddPendingTask(browser_context(),
177 guest_extension->id(), 175 guest_extension->id(),
178 base::Bind(&AppViewGuest::LaunchAppAndFireEvent, 176 base::Bind(&AppViewGuest::LaunchAppAndFireEvent,
179 weak_ptr_factory_.GetWeakPtr(), 177 weak_ptr_factory_.GetWeakPtr(),
180 callback)); 178 callback));
181 return; 179 return;
182 } 180 }
183 181
184 extensions::ProcessManager* process_manager = 182 extensions::ProcessManager* process_manager =
185 extensions::ExtensionSystem::Get(profile)->process_manager(); 183 extensions::ExtensionSystem::Get(browser_context())->process_manager();
186 ExtensionHost* host = 184 ExtensionHost* host =
187 process_manager->GetBackgroundHostForExtension(guest_extension->id()); 185 process_manager->GetBackgroundHostForExtension(guest_extension->id());
188 DCHECK(host); 186 DCHECK(host);
189 LaunchAppAndFireEvent(callback, host); 187 LaunchAppAndFireEvent(callback, host);
190 } 188 }
191 189
192 void AppViewGuest::DidAttachToEmbedder() { 190 void AppViewGuest::DidAttachToEmbedder() {
193 // This is called after the guest process has been attached to a host 191 // This is called after the guest process has been attached to a host
194 // element. This means that the host element knows how to route input 192 // element. This means that the host element knows how to route input
195 // events to the guest, and the guest knows how to get frames to the 193 // events to the guest, and the guest knows how to get frames to the
(...skipping 27 matching lines...) Expand all
223 browser_context(), 221 browser_context(),
224 content::SiteInstance::CreateForURL(browser_context(), 222 content::SiteInstance::CreateForURL(browser_context(),
225 guest_extension->url())); 223 guest_extension->url()));
226 params.guest_delegate = this; 224 params.guest_delegate = this;
227 callback.Run(WebContents::Create(params)); 225 callback.Run(WebContents::Create(params));
228 } 226 }
229 227
230 void AppViewGuest::LaunchAppAndFireEvent( 228 void AppViewGuest::LaunchAppAndFireEvent(
231 const WebContentsCreatedCallback& callback, 229 const WebContentsCreatedCallback& callback,
232 ExtensionHost* extension_host) { 230 ExtensionHost* extension_host) {
233 Profile* profile = Profile::FromBrowserContext(browser_context());
234 extensions::ExtensionSystem* system = 231 extensions::ExtensionSystem* system =
235 extensions::ExtensionSystem::Get(browser_context()); 232 extensions::ExtensionSystem::Get(browser_context());
236 bool has_event_listener = system->event_router()->ExtensionHasEventListener( 233 bool has_event_listener = system->event_router()->ExtensionHasEventListener(
237 extension_host->extension()->id(), 234 extension_host->extension()->id(),
238 app_runtime::OnEmbedRequested::kEventName); 235 app_runtime::OnEmbedRequested::kEventName);
239 if (!has_event_listener) { 236 if (!has_event_listener) {
240 callback.Run(NULL); 237 callback.Run(NULL);
241 return; 238 return;
242 } 239 }
243 240
244 scoped_ptr<base::DictionaryValue> embed_request(new base::DictionaryValue()); 241 scoped_ptr<base::DictionaryValue> embed_request(new base::DictionaryValue());
245 embed_request->SetInteger(appview::kGuestInstanceID, GetGuestInstanceID()); 242 embed_request->SetInteger(appview::kGuestInstanceID, GetGuestInstanceID());
246 embed_request->SetString(appview::kEmbedderID, embedder_extension_id()); 243 embed_request->SetString(appview::kEmbedderID, embedder_extension_id());
247 extensions::AppRuntimeEventRouter::DispatchOnEmbedRequestedEvent( 244 extensions::AppRuntimeEventRouter::DispatchOnEmbedRequestedEvent(
248 profile, embed_request.Pass(), extension_host->extension()); 245 browser_context(), embed_request.Pass(), extension_host->extension());
249 } 246 }
250 247
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698