chrome/browser/extensions/component_loader.cc - Issue 22451003: Enable Quickoffice Editor by default.

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 22451003: Enable Quickoffice Editor by default. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 7 years, 4 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 c0b626b6972f69cb2027cc319166f8aae35fd488..aad327a71e12926c4a4df17a3b19aaf7534346aa 100644

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

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

@@ -426,9 +426,9 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(

#if defined(GOOGLE_CHROME_BUILD)

if (!command_line->HasSwitch(

chromeos::switches::kDisableQuickofficeComponentApp)) {

- int manifest_id = IDR_QUICK_OFFICE_MANIFEST;

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

- manifest_id = IDR_QUICKOFFICE_EDITOR_MANIFEST;

+ int manifest_id = IDR_QUICKOFFICE_EDITOR_MANIFEST;

+ if (command_line->HasSwitch(switches::kEnableQuickofficeViewing)) {

+ manifest_id = IDR_QUICKOFFICE_VIEWING_MANIFEST;

}

std::string id = Add(manifest_id, base::FilePath(

FILE_PATH_LITERAL("/usr/share/chromeos-assets/quick_office")));