summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-06 17:09:58 +0000
committerdpolukhin@chromium.org <dpolukhin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-06 17:09:58 +0000
commit701b99d6f107e8676f3697ea64594ae3a4adcd64 (patch)
treed6690688d999d8595bfddd2752915cd9b49a158e
parent2664f57f656e131022fc2a37f015b3cad35690d4 (diff)
downloadchromium_src-701b99d6f107e8676f3697ea64594ae3a4adcd64.zip
chromium_src-701b99d6f107e8676f3697ea64594ae3a4adcd64.tar.gz
chromium_src-701b99d6f107e8676f3697ea64594ae3a4adcd64.tar.bz2
Switch Quickoffice to new internal repo
BUG=338855 TEST=manual NOTRY=true R=jhawkins@chromium.org, zork@chromium.org Review URL: https://codereview.chromium.org/187983003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255380 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--.gitignore1
-rw-r--r--chrome/browser/browser_resources.grd2
-rw-r--r--chrome/browser/extensions/component_loader.cc2
-rw-r--r--chrome/browser/resources/quick_office/OWNERS2
-rw-r--r--chrome/browser/resources/quick_office/manifest.json92
5 files changed, 3 insertions, 96 deletions
diff --git a/.gitignore b/.gitignore
index 63038a3..1ff7951 100644
--- a/.gitignore
+++ b/.gitignore
@@ -70,6 +70,7 @@ v8.log
/chrome/browser/internal
/chrome/browser/performance_monitor/performance_monitor.xml
/chrome/browser/protector/internal
+/chrome/browser/resources/chromeos/quickoffice
/chrome/browser/resources/pdf/html_office
/chrome/browser/resources/settings_internal/
/chrome/browser/resources/software_rendering_list
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index 9cfb896..e3c61a8 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -364,7 +364,7 @@
<if expr="chromeos and _google_chrome">
<include name="IDR_GENIUS_APP_MANIFEST" file="resources\chromeos\genius_app\manifest.json" type="BINDATA" />
<include name="IDR_HELP_MANIFEST" file="resources\help_app\manifest.json" type="BINDATA" />
- <include name="IDR_QUICKOFFICE_MANIFEST" file="resources\quick_office\manifest.json" type="BINDATA" />
+ <include name="IDR_QUICKOFFICE_MANIFEST" file="resources\chromeos\quickoffice\manifest.json" type="BINDATA" />
</if>
<if expr="chromeos">
<include name="IDR_SALSA_CSS" file="resources\chromeos\salsa.css" type="BINDATA" />
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc
index 1996146..af6fc56 100644
--- a/chrome/browser/extensions/component_loader.cc
+++ b/chrome/browser/extensions/component_loader.cc
@@ -498,7 +498,7 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
if (!command_line->HasSwitch(
chromeos::switches::kDisableQuickofficeComponentApp)) {
std::string id = Add(IDR_QUICKOFFICE_MANIFEST, base::FilePath(
- FILE_PATH_LITERAL("/usr/share/chromeos-assets/quick_office")));
+ FILE_PATH_LITERAL("/usr/share/chromeos-assets/quickoffice")));
EnableFileSystemInGuestMode(id);
}
#endif // defined(GOOGLE_CHROME_BUILD)
diff --git a/chrome/browser/resources/quick_office/OWNERS b/chrome/browser/resources/quick_office/OWNERS
deleted file mode 100644
index c78d452..0000000
--- a/chrome/browser/resources/quick_office/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-dpolukhin@chromium.org
-nkostylev@chromium.org
diff --git a/chrome/browser/resources/quick_office/manifest.json b/chrome/browser/resources/quick_office/manifest.json
deleted file mode 100644
index 1f41fba..0000000
--- a/chrome/browser/resources/quick_office/manifest.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
- "background": {
- "persistent": false,
- "scripts": [
- "scripts/configs/requirejsConfig.js",
- "scripts/third_party/requireJs/require.js",
- "scripts/configs/experimentalFeatures.js",
- "scripts/background/backgroundMain.js"
- ]
- },
- "content_security_policy": "default-src 'self'; connect-src https://www.google-analytics.com/ blob: chrome-extension:; style-src 'self' 'unsafe-inline' chrome-extension:; img-src 'self' blob: data:; frame-src chrome-extension:; script-src 'self'",
- "default_locale": "en",
- "description": "Quickoffice (Beta)",
- "file_browser_handlers": [
- {
- "default_title": "Quickoffice (Beta)",
- "file_filters": [
- "filesystem:*.doc",
- "filesystem:*.docx",
- "filesystem:*.docm",
- "filesystem:*.ppt",
- "filesystem:*.pptx",
- "filesystem:*.pptm",
- "filesystem:*.xls",
- "filesystem:*.xlsx"
- ],
- "id": "qoview"
- }
- ],
- "icons": {
- "16": "img/icon_16.png",
- "128": "img/icon_128.png"
- },
- "incognito": "split",
- "key": "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC7ctCVtjJUxR/gv6iYPkgLvhSG5j9IcbJEjqR1rbi1OvJOYQkAniDpYo46x9Ah68Fg4e0yTspvjABnB0N8YW+e7iOHhPWz7MfhRsM9AyXn8KvFwZ2BHvhXZVXBmk8wo/VkGZuw4RJWl/itpOCVwin7emaEboRQO6ETBXCVjmdYyQIDAQAB",
- "manifest_version": 2,
- "mime_types": [
- "application/msword",
- "application/vnd.ms-word",
- "application/vnd.msword",
- "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
- "application/vnd.wordprocessing-openxml",
- "application/vnd.ces-quickword",
- "application/vnd.ms-word.document.macroEnabled.12",
- "application/vnd.ms-word.document.12",
- "application/mspowerpoint",
- "application/vnd.ms-powerpoint",
- "application/vnd.openxmlformats-officedocument.presentationml.presentation",
- "application/vnd.ces-quickpoint",
- "application/vnd.presentation-openxml",
- "application/vnd.presentation-openxmlm",
- "application/vnd.ms-powerpoint.presentation.macroEnabled.12",
- "application/msexcel",
- "application/vnd.ms-excel",
- "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
- "application/vnd.ces-quicksheet",
- "application/vnd.spreadsheet-openxml",
- "application/vnd.ms-excel.sheet.macroEnabled.12"
- ],
- "name": "Quickoffice (Beta)",
- "offline_enabled": true,
- "permissions": [
- "clipboardRead",
- "clipboardWrite",
- "fileBrowserHandler",
- "fileSystem",
- "fileSystem.write",
- "https://www.google-analytics.com/",
- "metricsPrivate",
- "storage",
- "streamsPrivate",
- "unlimitedStorage"
- ],
- "platforms": [
- {
- "nacl_arch": "x86-32",
- "sub_package_path": "_platform_specific/x86_32/"
- },
- {
- "nacl_arch": "x86-64",
- "sub_package_path": "_platform_specific/x86_64/"
- },
- {
- "nacl_arch": "arm",
- "sub_package_path": "_platform_specific/arm/"
- }
- ],
- "version": "34.99.2070.1",
- "web_accessible_resources": [
- "views/qowt.html"
- ]
-}