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

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

Issue 426593007: Refactor guest view availability to be API not permission based. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: again Created 6 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 | Annotate | Revision Log
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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" 8 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
9 #include "chrome/browser/extensions/extension_service.h" 9 #include "chrome/browser/extensions/extension_service.h"
10 #include "chrome/browser/guest_view/app_view/app_view_constants.h" 10 #include "chrome/browser/guest_view/app_view/app_view_constants.h"
11 #include "chrome/browser/guest_view/guest_view_manager.h" 11 #include "chrome/browser/guest_view/guest_view_manager.h"
12 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" 12 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h"
13 #include "chrome/common/chrome_switches.h" 13 #include "chrome/common/chrome_switches.h"
14 #include "components/renderer_context_menu/context_menu_delegate.h" 14 #include "components/renderer_context_menu/context_menu_delegate.h"
15 #include "content/public/browser/render_view_host.h" 15 #include "content/public/browser/render_view_host.h"
16 #include "content/public/common/renderer_preferences.h" 16 #include "content/public/common/renderer_preferences.h"
17 #include "extensions/browser/api/app_runtime/app_runtime_api.h" 17 #include "extensions/browser/api/app_runtime/app_runtime_api.h"
18 #include "extensions/browser/event_router.h" 18 #include "extensions/browser/event_router.h"
19 #include "extensions/browser/extension_host.h" 19 #include "extensions/browser/extension_host.h"
20 #include "extensions/browser/extension_registry.h"
21 #include "extensions/browser/extension_system.h" 20 #include "extensions/browser/extension_system.h"
22 #include "extensions/browser/lazy_background_task_queue.h" 21 #include "extensions/browser/lazy_background_task_queue.h"
23 #include "extensions/browser/view_type_utils.h" 22 #include "extensions/browser/view_type_utils.h"
24 #include "extensions/common/api/app_runtime.h" 23 #include "extensions/common/api/app_runtime.h"
25 #include "extensions/common/extension_messages.h" 24 #include "extensions/common/extension_messages.h"
26 #include "extensions/common/permissions/permissions_data.h" 25 #include "extensions/common/features/feature.h"
26 #include "extensions/common/features/feature_provider.h"
27 #include "ipc/ipc_message_macros.h" 27 #include "ipc/ipc_message_macros.h"
28 28
29 namespace app_runtime = extensions::core_api::app_runtime; 29 namespace app_runtime = extensions::core_api::app_runtime;
30 30
31 using content::RenderFrameHost; 31 using content::RenderFrameHost;
32 using content::WebContents; 32 using content::WebContents;
33 using extensions::ExtensionHost; 33 using extensions::ExtensionHost;
34 34
35 namespace { 35 namespace {
36 36
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 ContextMenuDelegate* menu_delegate = 130 ContextMenuDelegate* menu_delegate =
131 ContextMenuDelegate::FromWebContents(guest_web_contents()); 131 ContextMenuDelegate::FromWebContents(guest_web_contents());
132 DCHECK(menu_delegate); 132 DCHECK(menu_delegate);
133 133
134 scoped_ptr<RenderViewContextMenu> menu = 134 scoped_ptr<RenderViewContextMenu> menu =
135 menu_delegate->BuildMenu(guest_web_contents(), params); 135 menu_delegate->BuildMenu(guest_web_contents(), params);
136 menu_delegate->ShowMenu(menu.Pass()); 136 menu_delegate->ShowMenu(menu.Pass());
137 return true; 137 return true;
138 } 138 }
139 139
140 bool AppViewGuest::CanEmbedderUseGuestView( 140 extensions::Feature* AppViewGuest::GetFeature() {
141 const std::string& embedder_extension_id) { 141 return extensions::FeatureProvider::GetAPIFeatures()->GetFeature(
142 const extensions::Extension* embedder_extension = 142 "appViewInternal");
not at google - send to devlin 2014/08/07 00:25:29 I'll define symbolic constants for each of these "
143 extensions::ExtensionRegistry::Get(browser_context())
144 ->enabled_extensions()
145 .GetByID(embedder_extension_id);
146 if (!embedder_extension)
147 return false;
148 return embedder_extension->permissions_data()->HasAPIPermission(
149 extensions::APIPermission::kAppView);
150 } 143 }
151 144
152 void AppViewGuest::CreateWebContents( 145 void AppViewGuest::CreateWebContents(
153 const std::string& embedder_extension_id, 146 const std::string& embedder_extension_id,
154 int embedder_render_process_id, 147 int embedder_render_process_id,
155 const base::DictionaryValue& create_params, 148 const base::DictionaryValue& create_params,
156 const WebContentsCreatedCallback& callback) { 149 const WebContentsCreatedCallback& callback) {
157 std::string app_id; 150 std::string app_id;
158 if (!create_params.GetString(appview::kAppID, &app_id)) { 151 if (!create_params.GetString(appview::kAppID, &app_id)) {
159 callback.Run(NULL); 152 callback.Run(NULL);
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 return; 244 return;
252 } 245 }
253 246
254 scoped_ptr<base::DictionaryValue> embed_request(new base::DictionaryValue()); 247 scoped_ptr<base::DictionaryValue> embed_request(new base::DictionaryValue());
255 embed_request->SetInteger(appview::kGuestInstanceID, GetGuestInstanceID()); 248 embed_request->SetInteger(appview::kGuestInstanceID, GetGuestInstanceID());
256 embed_request->SetString(appview::kEmbedderID, embedder_extension_id()); 249 embed_request->SetString(appview::kEmbedderID, embedder_extension_id());
257 extensions::AppRuntimeEventRouter::DispatchOnEmbedRequestedEvent( 250 extensions::AppRuntimeEventRouter::DispatchOnEmbedRequestedEvent(
258 browser_context(), embed_request.Pass(), extension_host->extension()); 251 browser_context(), embed_request.Pass(), extension_host->extension());
259 } 252 }
260 253
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698