chrome/browser/extensions/component_loader.cc - Issue 143733002: Remove FILE_MANAGER_EXTENSION and related configuration. They can be folded back to Chrome OS as co…

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 143733002: Remove FILE_MANAGER_EXTENSION and related configuration. They can be folded back to Chrome OS as co… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 11 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/chrome_content_browser_client.cc ('k') | chrome/browser/extensions/extension_icon_manager_unittest.cc » ('j') | no next file with comments »
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 5c27d841120e2f71586bd97ee8d0ae039893474d..89d4e959a261fe951377cc10ee8dc9c702c32d21 100644

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

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

@@ -272,7 +272,7 @@ bool ComponentLoader::Exists(const std::string& id) const {

}

void ComponentLoader::AddFileManagerExtension() {

-#if defined(FILE_MANAGER_EXTENSION)

+#if defined(OS_CHROMEOS)

#ifndef NDEBUG

const CommandLine* command_line = CommandLine::ForCurrentProcess();

if (command_line->HasSwitch(switches::kFileManagerExtensionPath)) {

@@ -284,7 +284,7 @@ void ComponentLoader::AddFileManagerExtension() {

#endif // NDEBUG

Add(IDR_FILEMANAGER_MANIFEST,

base::FilePath(FILE_PATH_LITERAL("file_manager")));

-#endif // defined(FILE_MANAGER_EXTENSION)

+#endif // defined(OS_CHROMEOS)

}

void ComponentLoader::AddHangoutServicesExtension() {

« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/extensions/extension_icon_manager_unittest.cc » ('j') | no next file with comments »