chrome/browser/extensions/component_loader.cc - Issue 9826032: hterm: Load component-extension version of crosh+hterm (chromeos only).

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 9826032: hterm: Load component-extension version of crosh+hterm (chromeos only). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Remove IsExtensionEnabled check Created 8 years, 9 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:

Index: chrome/browser/extensions/component_loader.cc

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

index 6936495e4bcb3933d4ce987e350bcd4e0d500c43..253cc19276d4114fe6a3379590e30d00e7f647e2 100644

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

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

@@ -281,6 +281,9 @@ void ComponentLoader::AddDefaultComponentExtensions() {

Add(IDR_MOBILE_MANIFEST,

FilePath(FILE_PATH_LITERAL("/usr/share/chromeos-assets/mobile")));

+ Add(IDR_CROSH_BUILTIN_MANIFEST, FilePath(FILE_PATH_LITERAL(

+ "/usr/share/chromeos-assets/crosh_builtin")));

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

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

FilePath auth_extension_path =