chrome/browser/guest_view/web_view/web_view_permission_helper.cc - Issue 502273002: Revert "Move core web_view code to extensions." (patchset #6 of https://codereview.chromium.org/4968

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/guest_view/web_view/web_view_permission_helper.cc

Issue 502273002: Revert "Move core web_view code to extensions." (patchset #6 of https://codereview.chromium.org/4968 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/guest_view/web_view/web_view_permission_helper.h ('k') | chrome/browser/guest_view/web_view/web_view_permission_types.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/guest_view/web_view/web_view_permission_helper.cc

diff --git a/extensions/browser/guest_view/web_view/web_view_permission_helper.cc b/chrome/browser/guest_view/web_view/web_view_permission_helper.cc

similarity index 95%

rename from extensions/browser/guest_view/web_view/web_view_permission_helper.cc

rename to chrome/browser/guest_view/web_view/web_view_permission_helper.cc

index 50e191187705e3f01d24dff653b3871067c7da7e..d3fc3a95e25ee14bf9516f5dc9b8104eaa6fed91 100644

--- a/extensions/browser/guest_view/web_view/web_view_permission_helper.cc

+++ b/chrome/browser/guest_view/web_view/web_view_permission_helper.cc

@@ -2,16 +2,16 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

-#include "extensions/browser/guest_view/web_view/web_view_permission_helper.h"

+#include "chrome/browser/guest_view/web_view/web_view_permission_helper.h"

+#include "chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.h"

+#include "chrome/browser/guest_view/web_view/web_view_constants.h"

+#include "chrome/browser/guest_view/web_view/web_view_guest.h"

+#include "chrome/browser/guest_view/web_view/web_view_permission_types.h"

#include "content/public/browser/render_process_host.h"

#include "content/public/browser/render_view_host.h"

#include "content/public/browser/user_metrics.h"

-#include "extensions/browser/api/extensions_api_client.h"

-#include "extensions/browser/guest_view/web_view/web_view_constants.h"

-#include "extensions/browser/guest_view/web_view/web_view_guest.h"

#include "extensions/browser/guest_view/web_view/web_view_permission_helper_delegate.h"

-#include "extensions/browser/guest_view/web_view/web_view_permission_types.h"

using content::BrowserPluginGuestDelegate;

using content::RenderViewHost;

@@ -134,9 +134,10 @@ WebViewPermissionHelper::WebViewPermissionHelper(WebViewGuest* web_view_guest)

next_permission_request_id_(guestview::kInstanceIDNone),

web_view_guest_(web_view_guest),

weak_factory_(this) {

+ // TODO(hanxi) : Create the delegate through ExtensionsAPIClient after

+ // moving WebViewPermissionHelper to extensions.

web_view_permission_helper_delegate_.reset(

- ExtensionsAPIClient::Get()->CreateWebViewPermissionHelperDelegate(

- this));

+ new ChromeWebViewPermissionHelperDelegate(this));

}

WebViewPermissionHelper::~WebViewPermissionHelper() {