Change branding of Quickoffice flag

Changed from Quickoffice to "Office Editing for Docs, Sheets & Slides"

BUG=
R=kurtz@chromium.org, asargent@chromium.org

Review URL: https://codereview.chromium.org/328143004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282372 0039d316-1c4b-4281-b951-d872f2087c98

chrome/app/chromeos_strings.grdp

@@ -1100,11 +1100,11 @@ Press any key to continue exploring.
   <message name="IDS_ECHO_CONSENT_DISMISS_BUTTON" desc="Dismiss dialog button label for disabled echo dialog.">
     Dismiss
   </message>
-  <message name="IDS_FLAGS_DISABLE_QUICKOFFICE_COMPONENT_APP_NAME" desc="Name for the flag to disable Chrome Office Viewer component extension.">
-    Disable Quickoffice component extension
+  <message name="IDS_FLAGS_DISABLE_OFFICE_EDITING_COMPONENT_APP_NAME" desc="Name for the flag to disable Office Editing for Docs, Sheets &amp; Slides component extension.">
+    Disable Office Editing for Docs, Sheets &amp; Slides
   </message>
-  <message name="IDS_FLAGS_DISABLE_QUICKOFFICE_COMPONENT_APP_DESCRIPTION" desc="Description for the flag to disable Chrome Office component extension.">
-    Disable Quickoffice component extension for testing purposes.
+  <message name="IDS_FLAGS_DISABLE_OFFICE_EDITING_COMPONENT_APP_DESCRIPTION" desc="Description for the flag to disable Office Editing for Docs, Sheets &amp; Slides component extension.">
+    Disable Office Editing for Docs, Sheets &amp; Slides for testing purposes
   </message>
   <message name="IDS_FLAGS_DISABLE_DISPLAY_COLOR_CALIBRATION_NAME" desc="Name for the flag to disable the color calibration of the display.">
     Disable the color calibration of the display.

chrome/browser/about_flags.cc

@@ -1046,11 +1046,11 @@ const Experiment kExperiments[] = {
     SINGLE_VALUE_TYPE(chromeos::switches::kEnableVideoPlayerChromecastSupport)
   },
   {
-    "disable-quickoffice-component-app",
-    IDS_FLAGS_DISABLE_QUICKOFFICE_COMPONENT_APP_NAME,
-    IDS_FLAGS_DISABLE_QUICKOFFICE_COMPONENT_APP_DESCRIPTION,
+    "disable-office-editing-component-app",
+    IDS_FLAGS_DISABLE_OFFICE_EDITING_COMPONENT_APP_NAME,
+    IDS_FLAGS_DISABLE_OFFICE_EDITING_COMPONENT_APP_DESCRIPTION,
     kOsCrOS,
-    SINGLE_VALUE_TYPE(chromeos::switches::kDisableQuickofficeComponentApp),
+    SINGLE_VALUE_TYPE(chromeos::switches::kDisableOfficeEditingComponentApp),
   },
   {
     "disable-saml-signin",

chrome/browser/extensions/component_loader.cc

@@ -526,7 +526,7 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
   if (!skip_session_components) {
 #if defined(GOOGLE_CHROME_BUILD)
     if (!command_line->HasSwitch(
-            chromeos::switches::kDisableQuickofficeComponentApp)) {
+            chromeos::switches::kDisableOfficeEditingComponentApp)) {
       std::string id = Add(IDR_QUICKOFFICE_MANIFEST, base::FilePath(
           FILE_PATH_LITERAL("/usr/share/chromeos-assets/quickoffice")));
       EnableFileSystemInGuestMode(id);

chromeos/chromeos_switches.cc

@@ -52,10 +52,11 @@ const char kDisableNewChannelSwitcherUI[] = "disable-new-channel-switcher-ui";
 // Disables new Kiosk UI when kiosk apps are represented as user pods.
 const char kDisableNewKioskUI[] = "disable-new-kiosk-ui";
 
-// Disable Quickoffice component app thus handlers won't be registered so
-// it will be possible to install another version as normal app for testing.
-const char kDisableQuickofficeComponentApp[] =
-    "disable-quickoffice-component-app";
+// Disable Office Editing for Docs, Sheets & Slides component app so handlers
+// won't be registered, making it possible to install another version for
+// testing.
+const char kDisableOfficeEditingComponentApp[] =
+    "disable-office-editing-component-extension";
 
 // Disables rollback option on reset screen.
 const char kDisableRollbackOption[] = "disable-rollback-option";

chromeos/chromeos_switches.h

@@ -35,7 +35,7 @@ CHROMEOS_EXPORT extern const char kDisableLoginScrollIntoView[];
 CHROMEOS_EXPORT extern const char kDisableNetworkPortalNotification[];
 CHROMEOS_EXPORT extern const char kDisableNewChannelSwitcherUI[];
 CHROMEOS_EXPORT extern const char kDisableNewKioskUI[];
-CHROMEOS_EXPORT extern const char kDisableQuickofficeComponentApp[];
+CHROMEOS_EXPORT extern const char kDisableOfficeEditingComponentApp[];
 CHROMEOS_EXPORT extern const char kDisableRollbackOption[];
 CHROMEOS_EXPORT extern const char kDisableSamlSignin[];
 CHROMEOS_EXPORT extern const char kDisableVolumeAdjustSound[];