chrome/browser/extensions/api/guest_view/guest_view_internal_api.cc - Issue 378783002: Initial implementation of the <extensionoptions> GuestView tag

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

Issue 378783002: Initial implementation of the <extensionoptions> GuestView tag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix problems with attaching guest view, add extension function dispatcher 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 | chrome/browser/guest_view/extension_options/extension_options_apitest.cc » ('j') | chrome/browser/guest_view/extension_options/extension_options_guest.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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"

(...skipping 15 matching lines...) Expand all Loading...
26	26

27 bool GuestViewInternalCreateGuestFunction::RunAsync() {	27 bool GuestViewInternalCreateGuestFunction::RunAsync() {

28 std::string view_type;	28 std::string view_type;

29 EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &view_type));	29 EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &view_type));

30	30

31 base::DictionaryValue* create_params;	31 base::DictionaryValue* create_params;

32 EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &create_params));	32 EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(1, &create_params));

33	33

34 const PermissionsData* permissions_data = GetExtension()->permissions_data();	34 const PermissionsData* permissions_data = GetExtension()->permissions_data();

35 if (!permissions_data->HasAPIPermission(APIPermission::kWebView) &&	35 if (!permissions_data->HasAPIPermission(APIPermission::kWebView) &&

36 !permissions_data->HasAPIPermission(APIPermission::kAppView)) {	36 !permissions_data->HasAPIPermission(APIPermission::kAppView) &&

	37 !permissions_data->HasAPIPermission(

	38 APIPermission::kEmbeddedExtensionOptions)) {
	Fady Samuel 2014/07/11 21:08:05 This is landing in a few minutes, please update: h This is landing in a few minutes, please update: https://codereview.chromium.org/378873002/ Permissions should happen on a per-GuestView basis. ericzeng 2014/07/14 18:22:32 Done. Show quoted text On 2014/07/11 21:08:05, Fady Samuel (OOO July 14 - 18) wrote: > This is landing in a few minutes, please update: > https://codereview.chromium.org/378873002/ > > Permissions should happen on a per-GuestView basis. Done.
37 LOG(ERROR) << kPermissionRequiredError;	39 LOG(ERROR) << kPermissionRequiredError;

38 error_ = kPermissionRequiredError;	40 error_ = kPermissionRequiredError;

39 SendResponse(false);	41 SendResponse(false);

40 }	42 }

41	43

42 GuestViewManager* guest_view_manager =	44 GuestViewManager* guest_view_manager =

43 GuestViewManager::FromBrowserContext(browser_context());	45 GuestViewManager::FromBrowserContext(browser_context());

44	46

45 GuestViewManager::WebContentsCreatedCallback callback =	47 GuestViewManager::WebContentsCreatedCallback callback =

46 base::Bind(&GuestViewInternalCreateGuestFunction::CreateGuestCallback,	48 base::Bind(&GuestViewInternalCreateGuestFunction::CreateGuestCallback,

(...skipping 10 matching lines...) Expand all Loading...
57 void GuestViewInternalCreateGuestFunction::CreateGuestCallback(	59 void GuestViewInternalCreateGuestFunction::CreateGuestCallback(

58 content::WebContents* guest_web_contents) {	60 content::WebContents* guest_web_contents) {

59 if (!guest_web_contents)	61 if (!guest_web_contents)

60 return;	62 return;

61 GuestViewBase* guest = GuestViewBase::FromWebContents(guest_web_contents);	63 GuestViewBase* guest = GuestViewBase::FromWebContents(guest_web_contents);

62 SetResult(base::Value::CreateIntegerValue(guest->GetGuestInstanceID()));	64 SetResult(base::Value::CreateIntegerValue(guest->GetGuestInstanceID()));

63 SendResponse(true);	65 SendResponse(true);

64 }	66 }

65	67

66 } // namespace extensions	68 } // namespace extensions

OLD	NEW