chrome/browser/extensions/extension_protocols.cc - Issue 65123002: Move chrome/common/extensions/background_info.h to src/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/extension_protocols.cc

Issue 65123002: Move chrome/common/extensions/background_info.h to src/extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase2 background_info Created 7 years, 1 month 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/extension_process_manager.cc ('k') | chrome/browser/extensions/extension_resource_protocols.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_protocols.cc

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

index d4981b1a067dad8e560d8a38504a4836dbf112ec..c638672e9d463785fafb056a3019fa46e9d58f2c 100644

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

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

@@ -27,10 +27,8 @@

#include "chrome/browser/extensions/extension_renderer_state.h"

#include "chrome/browser/extensions/image_loader.h"

#include "chrome/common/chrome_paths.h"

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

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

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

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

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

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

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

@@ -41,6 +39,8 @@

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

#include "extensions/common/constants.h"

#include "extensions/common/extension_resource.h"

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

+#include "extensions/common/manifest_handlers/background_info.h"

#include "extensions/common/manifest_handlers/incognito_info.h"

#include "grit/component_extension_resources_map.h"

#include "net/base/mime_util.h"

@@ -531,7 +531,7 @@ ExtensionProtocolHandler::MaybeCreateJob(

// extension relative path against resources_path.

resources_path.AppendRelativePath(directory_path, &relative_path)) {

base::FilePath request_path =

- extension_file_util::ExtensionURLToRelativeFilePath(request->url());

+ extensions::file_util::ExtensionURLToRelativeFilePath(request->url());

int resource_id;

if (extensions::ImageLoader::IsComponentExtensionResource(

directory_path, request_path, &resource_id)) {

@@ -548,7 +548,7 @@ ExtensionProtocolHandler::MaybeCreateJob(

}

relative_path =

- extension_file_util::ExtensionURLToRelativeFilePath(request->url());

+ extensions::file_util::ExtensionURLToRelativeFilePath(request->url());

if (SharedModuleInfo::IsImportedPath(path)) {

std::string new_extension_id;