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

Side by Side Diff: chrome/browser/extensions/api/guest_view/guest_view_internal_api.cc

Issue 336283002: Remove GuestWebContentsCreated (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@simplify_creation
Patch Set: Merge with ToT Created 6 years, 6 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
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/extensions/api/guest_view/guest_view_internal_api.h" 5 #include "chrome/browser/extensions/api/guest_view/guest_view_internal_api.h"
6 6
7 #include "chrome/browser/guest_view/guest_view_base.h"
7 #include "chrome/browser/guest_view/guest_view_manager.h" 8 #include "chrome/browser/guest_view/guest_view_manager.h"
8 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/common/extensions/api/guest_view_internal.h" 10 #include "chrome/common/extensions/api/guest_view_internal.h"
11 #include "content/public/browser/render_process_host.h"
12 #include "content/public/browser/render_view_host.h"
10 #include "extensions/common/permissions/permissions_data.h" 13 #include "extensions/common/permissions/permissions_data.h"
11 14
12 namespace { 15 namespace {
13 const char* kWebViewPermissionRequiredError = 16 const char* kWebViewPermissionRequiredError =
14 "\"webview\" permission is required for allocating instance ID."; 17 "\"webview\" permission is required for allocating instance ID.";
15 } // namespace 18 } // namespace
16 19
17 namespace extensions { 20 namespace extensions {
18 21
19 GuestViewInternalAllocateInstanceIdFunction:: 22 GuestViewInternalCreateGuestFunction::
20 GuestViewInternalAllocateInstanceIdFunction() { 23 GuestViewInternalCreateGuestFunction() {
21 } 24 }
22 25
23 bool GuestViewInternalAllocateInstanceIdFunction::RunAsync() { 26 bool GuestViewInternalCreateGuestFunction::RunAsync() {
24 EXTENSION_FUNCTION_VALIDATE(!args_->GetSize()); 27 std::string view_type;
28 EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &view_type));
25 29
30 base::DictionaryValue* create_params;
31 EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &create_params));
26 32
27 if (!GetExtension()->permissions_data()->HasAPIPermission( 33 if (!GetExtension()->permissions_data()->HasAPIPermission(
28 APIPermission::kWebView)) { 34 APIPermission::kWebView)) {
29 LOG(ERROR) << kWebViewPermissionRequiredError; 35 LOG(ERROR) << kWebViewPermissionRequiredError;
30 error_ = kWebViewPermissionRequiredError; 36 error_ = kWebViewPermissionRequiredError;
31 SendResponse(false); 37 SendResponse(false);
32 return false;
33 } 38 }
34 39
35 int instanceId = GuestViewManager::FromBrowserContext(browser_context()) 40 GuestViewManager* guest_view_manager =
36 ->GetNextInstanceID(); 41 GuestViewManager::FromBrowserContext(browser_context());
37 SetResult(base::Value::CreateIntegerValue(instanceId)); 42
43 content::WebContents* guest_web_contents =
44 guest_view_manager->CreateGuest(view_type,
45 extension_id(),
46 render_view_host()->GetProcess()->GetID(),
47 *create_params);
48 if (!guest_web_contents)
49 return false;
50
51 GuestViewBase* guest = GuestViewBase::FromWebContents(guest_web_contents);
52 SetResult(base::Value::CreateIntegerValue(guest->GetGuestInstanceID()));
38 SendResponse(true); 53 SendResponse(true);
39 return true; 54 return true;
40 } 55 }
41 56
42 } // namespace extensions 57 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/guest_view/guest_view_internal_api.h ('k') | chrome/browser/guest_view/guest_view_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698