OLD | NEW |
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_base.h" |
8 #include "chrome/browser/guest_view/guest_view_manager.h" | 8 #include "chrome/browser/guest_view/guest_view_manager.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #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" | 11 #include "content/public/browser/render_process_host.h" |
12 #include "content/public/browser/render_view_host.h" | 12 #include "content/public/browser/render_view_host.h" |
13 #include "extensions/common/permissions/permissions_data.h" | 13 #include "extensions/common/permissions/permissions_data.h" |
14 | 14 |
15 namespace { | 15 namespace { |
16 const char* kWebViewPermissionRequiredError = | 16 const char* kPermissionRequiredError = |
17 "\"webview\" permission is required for allocating instance ID."; | 17 "\"webview\" or \"appview\" permission is required for allocating " |
| 18 "instance ID."; |
18 } // namespace | 19 } // namespace |
19 | 20 |
20 namespace extensions { | 21 namespace extensions { |
21 | 22 |
22 GuestViewInternalCreateGuestFunction:: | 23 GuestViewInternalCreateGuestFunction:: |
23 GuestViewInternalCreateGuestFunction() { | 24 GuestViewInternalCreateGuestFunction() { |
24 } | 25 } |
25 | 26 |
26 bool GuestViewInternalCreateGuestFunction::RunAsync() { | 27 bool GuestViewInternalCreateGuestFunction::RunAsync() { |
27 std::string view_type; | 28 std::string view_type; |
28 EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &view_type)); | 29 EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &view_type)); |
29 | 30 |
30 base::DictionaryValue* create_params; | 31 base::DictionaryValue* create_params; |
31 EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &create_params)); | 32 EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &create_params)); |
32 | 33 |
33 if (!GetExtension()->permissions_data()->HasAPIPermission( | 34 const PermissionsData* permissions_data = GetExtension()->permissions_data(); |
34 APIPermission::kWebView)) { | 35 if (!permissions_data->HasAPIPermission(APIPermission::kWebView) && |
35 LOG(ERROR) << kWebViewPermissionRequiredError; | 36 !permissions_data->HasAPIPermission(APIPermission::kAppView)) { |
36 error_ = kWebViewPermissionRequiredError; | 37 LOG(ERROR) << kPermissionRequiredError; |
| 38 error_ = kPermissionRequiredError; |
37 SendResponse(false); | 39 SendResponse(false); |
38 } | 40 } |
39 | 41 |
40 GuestViewManager* guest_view_manager = | 42 GuestViewManager* guest_view_manager = |
41 GuestViewManager::FromBrowserContext(browser_context()); | 43 GuestViewManager::FromBrowserContext(browser_context()); |
42 | 44 |
43 GuestViewManager::WebContentsCreatedCallback callback = | 45 GuestViewManager::WebContentsCreatedCallback callback = |
44 base::Bind(&GuestViewInternalCreateGuestFunction::CreateGuestCallback, | 46 base::Bind(&GuestViewInternalCreateGuestFunction::CreateGuestCallback, |
45 this); | 47 this); |
46 guest_view_manager->CreateGuest(view_type, | 48 guest_view_manager->CreateGuest(view_type, |
47 extension_id(), | 49 extension_id(), |
48 render_view_host()->GetProcess()->GetID(), | 50 render_view_host()->GetProcess()->GetID(), |
49 *create_params, | 51 *create_params, |
50 callback); | 52 callback); |
51 | 53 |
52 return true; | 54 return true; |
53 } | 55 } |
54 | 56 |
55 void GuestViewInternalCreateGuestFunction::CreateGuestCallback( | 57 void GuestViewInternalCreateGuestFunction::CreateGuestCallback( |
56 content::WebContents* guest_web_contents) { | 58 content::WebContents* guest_web_contents) { |
57 if (!guest_web_contents) | 59 if (!guest_web_contents) |
58 return; | 60 return; |
59 GuestViewBase* guest = GuestViewBase::FromWebContents(guest_web_contents); | 61 GuestViewBase* guest = GuestViewBase::FromWebContents(guest_web_contents); |
60 SetResult(base::Value::CreateIntegerValue(guest->GetGuestInstanceID())); | 62 SetResult(base::Value::CreateIntegerValue(guest->GetGuestInstanceID())); |
61 SendResponse(true); | 63 SendResponse(true); |
62 } | 64 } |
63 | 65 |
64 } // namespace extensions | 66 } // namespace extensions |
OLD | NEW |