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

Side by Side Diff: chrome/browser/guest_view/guest_view_base.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: app view 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/guest_view_base.h" 5 #include "chrome/browser/guest_view/guest_view_base.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/guest_view/app_view/app_view_guest.h" 9 #include "chrome/browser/guest_view/app_view/app_view_guest.h"
10 #include "chrome/browser/guest_view/extension_options/extension_options_guest.h" 10 #include "chrome/browser/guest_view/extension_options/extension_options_guest.h"
11 #include "chrome/browser/guest_view/guest_view_constants.h" 11 #include "chrome/browser/guest_view/guest_view_constants.h"
12 #include "chrome/browser/guest_view/guest_view_manager.h" 12 #include "chrome/browser/guest_view/guest_view_manager.h"
13 #include "chrome/browser/guest_view/web_view/web_view_guest.h" 13 #include "chrome/browser/guest_view/web_view/web_view_guest.h"
14 #include "chrome/common/content_settings.h" 14 #include "chrome/common/content_settings.h"
15 #include "content/public/browser/render_frame_host.h" 15 #include "content/public/browser/render_frame_host.h"
16 #include "content/public/browser/render_process_host.h" 16 #include "content/public/browser/render_process_host.h"
17 #include "content/public/browser/render_view_host.h" 17 #include "content/public/browser/render_view_host.h"
18 #include "content/public/browser/web_contents.h" 18 #include "content/public/browser/web_contents.h"
19 #include "content/public/common/url_constants.h" 19 #include "content/public/common/url_constants.h"
20 #include "extensions/browser/event_router.h" 20 #include "extensions/browser/event_router.h"
21 #include "extensions/browser/extension_registry.h"
22 #include "extensions/browser/process_map.h"
23 #include "extensions/common/features/feature.h"
21 #include "third_party/WebKit/public/web/WebInputEvent.h" 24 #include "third_party/WebKit/public/web/WebInputEvent.h"
22 25
23 using content::WebContents; 26 using content::WebContents;
24 27
25 namespace { 28 namespace {
26 29
27 typedef std::map<std::string, GuestViewBase::GuestCreationCallback> 30 typedef std::map<std::string, GuestViewBase::GuestCreationCallback>
28 GuestViewCreationMap; 31 GuestViewCreationMap;
29 static base::LazyInstance<GuestViewCreationMap> guest_view_registry = 32 static base::LazyInstance<GuestViewCreationMap> guest_view_registry =
30 LAZY_INSTANCE_INITIALIZER; 33 LAZY_INSTANCE_INITIALIZER;
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 : embedder_web_contents_(NULL), 93 : embedder_web_contents_(NULL),
91 embedder_render_process_id_(0), 94 embedder_render_process_id_(0),
92 browser_context_(browser_context), 95 browser_context_(browser_context),
93 guest_instance_id_(guest_instance_id), 96 guest_instance_id_(guest_instance_id),
94 view_instance_id_(guestview::kInstanceIDNone), 97 view_instance_id_(guestview::kInstanceIDNone),
95 initialized_(false), 98 initialized_(false),
96 auto_size_enabled_(false), 99 auto_size_enabled_(false),
97 weak_ptr_factory_(this) { 100 weak_ptr_factory_(this) {
98 } 101 }
99 102
100 void GuestViewBase::Init( 103 void GuestViewBase::Init(const std::string& embedder_extension_id,
101 const std::string& embedder_extension_id, 104 int embedder_render_process_id,
102 int embedder_render_process_id, 105 content::WebContents* web_contents,
103 const base::DictionaryValue& create_params, 106 const base::DictionaryValue& create_params,
104 const WebContentsCreatedCallback& callback) { 107 const WebContentsCreatedCallback& callback) {
105 if (initialized_) 108 if (initialized_)
106 return; 109 return;
107 initialized_ = true; 110 initialized_ = true;
108 111
109 if (!CanEmbedderUseGuestView(embedder_extension_id)) { 112 extensions::Feature* feature = GetFeature();
113 CHECK(feature);
114
115 const extensions::Extension* embedder_extension =
116 extensions::ExtensionRegistry::Get(browser_context_)
117 ->enabled_extensions()
118 .GetByID(embedder_extension_id);
119
120 extensions::ProcessMap* process_map =
121 extensions::ProcessMap::Get(browser_context());
122 CHECK(process_map);
123
124 extensions::Feature::Availability availability =
125 feature->IsAvailableToContext(
Fady Samuel 2014/08/07 17:29:31 appViewInternal is available in all apps I think.
not at google - send to devlin 2014/08/07 17:34:41 appViewInternal is defined like: https://code.goo
126 embedder_extension,
127 process_map->GuessContextType(embedder_extension,
128 embedder_render_process_id),
129 web_contents->GetLastCommittedURL());
130
131 if (availability.is_available()) {
Fady Samuel 2014/08/07 17:29:31 Early exit preferred: if (!availability.is_availa
not at google - send to devlin 2014/08/07 17:34:41 yeah this was an accidental change :)
132 CreateWebContents(embedder_extension_id,
133 embedder_render_process_id,
134 create_params,
135 base::Bind(&GuestViewBase::CompleteInit,
136 AsWeakPtr(),
137 embedder_extension_id,
138 embedder_render_process_id,
139 callback));
140 } else {
110 callback.Run(NULL); 141 callback.Run(NULL);
111 return;
112 } 142 }
113
114 CreateWebContents(embedder_extension_id,
115 embedder_render_process_id,
116 create_params,
117 base::Bind(&GuestViewBase::CompleteInit,
118 AsWeakPtr(),
119 embedder_extension_id,
120 embedder_render_process_id,
121 callback));
122 } 143 }
123 144
124 void GuestViewBase::InitWithWebContents( 145 void GuestViewBase::InitWithWebContents(
125 const std::string& embedder_extension_id, 146 const std::string& embedder_extension_id,
126 int embedder_render_process_id, 147 int embedder_render_process_id,
127 content::WebContents* guest_web_contents) { 148 content::WebContents* guest_web_contents) {
128 DCHECK(guest_web_contents); 149 DCHECK(guest_web_contents);
129 content::RenderProcessHost* embedder_render_process_host = 150 content::RenderProcessHost* embedder_render_process_host =
130 content::RenderProcessHost::FromID(embedder_render_process_id); 151 content::RenderProcessHost::FromID(embedder_render_process_id);
131 152
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
440 guest_web_contents); 461 guest_web_contents);
441 callback.Run(guest_web_contents); 462 callback.Run(guest_web_contents);
442 } 463 }
443 464
444 // static 465 // static
445 void GuestViewBase::RegisterGuestViewTypes() { 466 void GuestViewBase::RegisterGuestViewTypes() {
446 AppViewGuest::Register(); 467 AppViewGuest::Register();
447 ExtensionOptionsGuest::Register(); 468 ExtensionOptionsGuest::Register();
448 WebViewGuest::Register(); 469 WebViewGuest::Register();
449 } 470 }
OLDNEW
« no previous file with comments | « chrome/browser/guest_view/guest_view_base.h ('k') | chrome/browser/guest_view/guest_view_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698