chrome/browser/extensions/active_tab_permission_granter.cc - Issue 19678004: Move UserScript and Extension switches to top-level extensions/.

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

Issue 19678004: Move UserScript and Extension switches to top-level extensions/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 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:

Index: chrome/browser/extensions/active_tab_permission_granter.cc

diff --git a/chrome/browser/extensions/active_tab_permission_granter.cc b/chrome/browser/extensions/active_tab_permission_granter.cc

index 97440e2a74fe27ffca1e93a7a9ae3628c1696185..312a6c3558375bfb5583d648d0496e5ccd8e0bc9 100644

--- a/chrome/browser/extensions/active_tab_permission_granter.cc

+++ b/chrome/browser/extensions/active_tab_permission_granter.cc

@@ -13,13 +13,13 @@

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

#include "chrome/common/extensions/permissions/permission_set.h"

#include "chrome/common/extensions/permissions/permissions_data.h"

-#include "chrome/common/extensions/user_script.h"

-#include "content/public/browser/navigation_entry.h"

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

+#include "content/public/browser/navigation_entry.h"

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

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

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

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

+#include "extensions/common/user_script.h"

using content::RenderProcessHost;

using content::WebContentsObserver;