chrome/renderer/extensions/resource_request_policy.cc - Issue 562603002: Move PageTransition from //content/public/common to //ui/base

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/renderer/extensions/resource_request_policy.cc

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 6 years, 3 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/renderer/extensions/resource_request_policy.h ('k') | chrome/renderer/safe_browsing/phishing_classifier_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/renderer/extensions/resource_request_policy.cc

diff --git a/chrome/renderer/extensions/resource_request_policy.cc b/chrome/renderer/extensions/resource_request_policy.cc

index 08ba2a09557f91b71eb7fa61a551960645dafcb0..ed136218eb9fb30f93185521f6a0de7169b03249 100644

--- a/chrome/renderer/extensions/resource_request_policy.cc

+++ b/chrome/renderer/extensions/resource_request_policy.cc

@@ -8,7 +8,6 @@

#include "base/strings/stringprintf.h"

#include "chrome/common/extensions/manifest_url_handler.h"

#include "chrome/common/url_constants.h"

-#include "content/public/common/page_transition_types.h"

#include "extensions/common/constants.h"

#include "extensions/common/extension.h"

#include "extensions/common/extension_set.h"

@@ -18,6 +17,7 @@

#include "third_party/WebKit/public/web/WebConsoleMessage.h"

#include "third_party/WebKit/public/web/WebDocument.h"

#include "third_party/WebKit/public/web/WebFrame.h"

+#include "ui/base/page_transition_types.h"

#include "url/gurl.h"

namespace extensions {

@@ -32,7 +32,7 @@ namespace extensions {

bool ResourceRequestPolicy::CanRequestResource(

const GURL& resource_url,

blink::WebFrame* frame,

- content::PageTransition transition_type,

+ ui::PageTransition transition_type,

const ExtensionSet* loaded_extensions) {

CHECK(resource_url.SchemeIs(extensions::kExtensionScheme));

@@ -78,7 +78,7 @@ bool ResourceRequestPolicy::CanRequestResource(

bool is_dev_tools = page_url.SchemeIs(content::kChromeDevToolsScheme) &&

!ManifestURL::GetDevToolsPage(extension).is_empty();

bool transition_allowed =

- !content::PageTransitionIsWebTriggerable(transition_type);

+ !ui::PageTransitionIsWebTriggerable(transition_type);

// - unreachable web page error page (to allow showing the icon of the

// unreachable app on this page)

bool is_error_page = frame_url == GURL(content::kUnreachableWebDataURL);