chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.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/chromeos/input_method/component_extension_ime_manager_impl.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/chromeos/file_manager/zip_file_creator.cc ('k') | chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.cc » ('j') | extensions/common/file_util_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc

diff --git a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc

index 479ed3d4185a31997d1006f853f02dff177ebf59..8afa4b92b654cf04aa698b0e93eaaa78d0a45f94 100644

--- a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc

+++ b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc

@@ -10,11 +10,11 @@

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

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

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

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

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

#include "extensions/browser/extension_system.h"

#include "extensions/common/extension.h"

#include "extensions/common/extension_l10n_util.h"

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

#include "extensions/common/manifest_constants.h"

#include "ui/base/l10n/l10n_util.h"

@@ -141,7 +141,7 @@ scoped_ptr<base::DictionaryValue> ComponentExtensionIMEManagerImpl::GetManifest(

DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));

std::string error;

scoped_ptr<base::DictionaryValue> manifest(

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

+ extensions::file_util::LoadManifest(file_path, &error));

if (!manifest.get())

LOG(ERROR) << "Failed at getting manifest";

if (!extension_l10n_util::LocalizeExtension(file_path,