chrome/browser/extensions/installed_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/installed_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: zip (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

« apps/shell/DEPS ('K') | « chrome/browser/extensions/extension_service.cc ('k') | chrome/browser/extensions/requirements_checker_browsertest.cc » ('j') | chrome/common/extensions/extension_file_util_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/installed_loader.cc

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

index ba5710f7dc3531a5893304ebd1114bdae936607e..dbf79252ff3f693ed80c474858f943bf901db11c 100644

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

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

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

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/extensions/api/managed_mode_private/managed_mode_handler.h"

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

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

#include "chrome/common/pref_names.h"

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

@@ -28,6 +27,7 @@

#include "extensions/browser/management_policy.h"

#include "extensions/common/extension.h"

#include "extensions/common/extension_l10n_util.h"

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

#include "extensions/common/manifest.h"

#include "extensions/common/manifest_constants.h"

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

@@ -217,11 +217,10 @@ void InstalledLoader::LoadAllExtensions() {

std::string error;

scoped_refptr<const Extension> extension(

- extension_file_util::LoadExtension(

- info->extension_path,

- info->extension_location,

- GetCreationFlags(info),

- &error));

+ file_util::LoadExtension(info->extension_path,

+ info->extension_location,

+ GetCreationFlags(info),

+ &error));

if (!extension.get()) {

extension_service_->ReportExtensionLoadError(