Delete me

Localize Google Cloud Print in strings.
Change UI interaction points to reference connector instead of proxy.
Fix strings for connector in options to be more clearly about the connector.

BUG=107252,107592
TEST=


Review URL: http://codereview.chromium.org/8936013

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

2 files changed, 29 insertions, 29 deletions

diff --git a/chrome/browser/resources/options/advanced_options.html b/chrome/browser/resources/options/advanced_options.html
index 525eb99..99c613c 100644
--- a/chrome/browser/resources/options/advanced_options.html
+++ b/chrome/browser/resources/options/advanced_options.html
@@ -185,22 +185,22 @@
       </div>
     </section>
 <if expr="not pp_ifdef('chromeos')">
-    <section id="cloud-print-proxy-section">
+    <section id="cloud-print-connector-section">
       <h3 i18n-content="advancedSectionTitleCloudPrint"></h3>
       <div>
-        <div id="cloudPrintProxyLabel"
-             i18n-content="cloudPrintProxyDisabledLabel"></div>
+        <div id="cloudPrintConnectorLabel"
+             i18n-content="cloudPrintConnectorDisabledLabel"></div>
         <div class="section-group">
-          <button id="cloudPrintProxySetupButton"
-                  i18n-content="cloudPrintProxyDisabledButton"></button>
-          <button id="cloudPrintProxyManageButton"
-                  i18n-content="cloudPrintProxyEnabledManageButton"></button>
+          <button id="cloudPrintConnectorSetupButton"
+                  i18n-content="cloudPrintConnectorDisabledButton"></button>
+          <button id="cloudPrintManageButton"
+                  i18n-content="cloudPrintConnectorEnabledManageButton"></button>
         </div>
       </div>
     </section>
 </if>
 <if expr="pp_ifdef('chromeos')">
-  <section id="cloud-print-proxy-section">
+  <section id="cloud-print-connector-section">
     <h3 i18n-content="advancedSectionTitleCloudPrint"></h3>
     <div>
       <div>
@@ -211,7 +211,7 @@
             i18n-values="href:cloudPrintLearnMoreURL"></a>
       </div>
       <div class="section-group">
-        <button id="cloudPrintProxyManageButton"
+        <button id="cloudPrintManageButton"
                 i18n-content="cloudPrintChromeosOptionButton"></button>
       </div>
     </div>
diff --git a/chrome/browser/resources/options/advanced_options.js b/chrome/browser/resources/options/advanced_options.js
index fb1a809..846202d 100644
--- a/chrome/browser/resources/options/advanced_options.js
+++ b/chrome/browser/resources/options/advanced_options.js
@@ -114,19 +114,19 @@ var OptionsPage = options.OptionsPage;
       // 'cloudPrintProxyEnabled' is true for Chrome branded builds on
       // certain platforms, or could be enabled by a lab.
       if (!cr.isChromeOS) {
-        $('cloudPrintProxySetupButton').onclick = function(event) {
-          if ($('cloudPrintProxyManageButton').style.display == 'none') {
+        $('cloudPrintConnectorSetupButton').onclick = function(event) {
+          if ($('cloudPrintManageButton').style.display == 'none') {
             // Disable the button, set it's text to the intermediate state.
-            $('cloudPrintProxySetupButton').textContent =
-              localStrings.getString('cloudPrintProxyEnablingButton');
-            $('cloudPrintProxySetupButton').disabled = true;
+            $('cloudPrintConnectorSetupButton').textContent =
+              localStrings.getString('cloudPrintConnectorEnablingButton');
+            $('cloudPrintConnectorSetupButton').disabled = true;
             chrome.send('showCloudPrintSetupDialog');
           } else {
-            chrome.send('disableCloudPrintProxy');
+            chrome.send('disableCloudPrintConnector');
           }
         };
       }
-      $('cloudPrintProxyManageButton').onclick = function(event) {
+      $('cloudPrintManageButton').onclick = function(event) {
         chrome.send('showCloudPrintManagePage');
       };
 
@@ -233,28 +233,28 @@ var OptionsPage = options.OptionsPage;
   };
 
   // Set the Cloud Print proxy UI to enabled, disabled, or processing.
-  AdvancedOptions.SetupCloudPrintProxySection = function(
+  AdvancedOptions.SetupCloudPrintConnectorSection = function(
         disabled, label, allowed) {
     if (!cr.isChromeOS) {
-      $('cloudPrintProxyLabel').textContent = label;
+      $('cloudPrintConnectorLabel').textContent = label;
       if (disabled || !allowed) {
-        $('cloudPrintProxySetupButton').textContent =
-          localStrings.getString('cloudPrintProxyDisabledButton');
-        $('cloudPrintProxyManageButton').style.display = 'none';
+        $('cloudPrintConnectorSetupButton').textContent =
+          localStrings.getString('cloudPrintConnectorDisabledButton');
+        $('cloudPrintManageButton').style.display = 'none';
       } else {
-        $('cloudPrintProxySetupButton').textContent =
-          localStrings.getString('cloudPrintProxyEnabledButton');
-        $('cloudPrintProxyManageButton').style.display = 'inline';
+        $('cloudPrintConnectorSetupButton').textContent =
+          localStrings.getString('cloudPrintConnectorEnabledButton');
+        $('cloudPrintManageButton').style.display = 'inline';
       }
-      $('cloudPrintProxySetupButton').disabled = !allowed;
+      $('cloudPrintConnectorSetupButton').disabled = !allowed;
     }
   };
 
-  AdvancedOptions.RemoveCloudPrintProxySection = function() {
+  AdvancedOptions.RemoveCloudPrintConnectorSection = function() {
     if (!cr.isChromeOS) {
-      var proxySectionElm = $('cloud-print-proxy-section');
-      if (proxySectionElm)
-        proxySectionElm.parentNode.removeChild(proxySectionElm);
+      var connectorSectionElm = $('cloud-print-connector-section');
+      if (connectorSectionElm)
+        connectorSectionElm.parentNode.removeChild(connectorSectionElm);
     }
   };