chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc - Issue 515563003: Remove dependency of chrome in WebRequestPermissions.

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/chrome_content_browser_client_extensions_part.cc

Issue 515563003: Remove dependency of chrome in WebRequestPermissions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Updated. 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/browser/extensions/chrome_app_sorting_unittest.cc ('k') | chrome/browser/extensions/extension_install_ui_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc

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

index 36cd96ba9eb5a7b499adb419853c80c8b2857e30..299d9d57a909f4d77587ec79874e6456671bd262 100644

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

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

@@ -20,7 +20,6 @@

#include "chrome/browser/renderer_host/chrome_extension_message_filter.h"

#include "chrome/browser/sync_file_system/local/sync_file_system_backend.h"

#include "chrome/common/chrome_constants.h"

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

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

#include "chrome/common/extensions/manifest_handlers/app_isolation_info.h"

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

@@ -197,7 +196,7 @@ bool ChromeContentBrowserClientExtensionsPart::CanCommitURL(

service->extensions()->GetExtensionOrAppByURL(url);

if (new_extension &&

new_extension->is_hosted_app() &&

- new_extension->id() == extension_misc::kWebStoreAppId &&

+ new_extension->id() == extensions::kWebStoreAppId &&

!ProcessMap::Get(profile)->Contains(

new_extension->id(), process_host->GetID())) {

return false;

@@ -299,14 +298,14 @@ bool ChromeContentBrowserClientExtensionsPart::

service->extensions()->GetExtensionOrAppByURL(current_url);

if (current_extension &&

current_extension->is_hosted_app() &&

- current_extension->id() != extension_misc::kWebStoreAppId)

+ current_extension->id() != extensions::kWebStoreAppId)

current_extension = NULL;

const Extension* new_extension =

service->extensions()->GetExtensionOrAppByURL(new_url);

if (new_extension &&

new_extension->is_hosted_app() &&

- new_extension->id() != extension_misc::kWebStoreAppId)

+ new_extension->id() != extensions::kWebStoreAppId)

new_extension = NULL;

// First do a process check. We should force a BrowsingInstance swap if the