chrome/browser/extensions/component_loader.cc - Issue 236213002: Move most of extension_file_util.cc into extensions/common/file_util.cc

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

Issue 236213002: Move most of extension_file_util.cc into extensions/common/file_util.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase (file-util) Created 6 years, 8 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/app_process_apitest.cc ('k') | chrome/browser/extensions/convert_user_script.cc » ('j') | extensions/common/file_util_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/component_loader.cc

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

index 39da625968ab0b81f2ac2c5085a204a63c3741e8..4e9e4b3990737e21a04d348d22ce110092a4b54c 100644

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

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

@@ -19,12 +19,12 @@

#include "chrome/common/chrome_paths.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/chrome_version_info.h"

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

#include "chrome/common/pref_names.h"

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

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

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

#include "extensions/common/extension.h"

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

#include "extensions/common/id_util.h"

#include "extensions/common/manifest_constants.h"

#include "grit/browser_resources.h"

@@ -196,7 +196,7 @@ std::string ComponentLoader::AddOrReplace(const base::FilePath& path) {

base::FilePath absolute_path = base::MakeAbsoluteFilePath(path);

std::string error;

scoped_ptr<base::DictionaryValue> manifest(

- extension_file_util::LoadManifest(absolute_path, &error));

+ file_util::LoadManifest(absolute_path, &error));

if (!manifest) {

LOG(ERROR) << "Could not load extension from '" <<

absolute_path.value() << "'. " << error;