summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorscottbyer@chromium.org <scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-05 17:00:47 +0000
committerscottbyer@chromium.org <scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-05 17:00:47 +0000
commit7bee0b26ed1f679a467f70e705aa98e201caa781 (patch)
tree262b800789e1b6bd1348e5dab9aff3951a5caa3c
parent2584175b3e3eca657e6070dc82879469402f0ca2 (diff)
downloadchromium_src-7bee0b26ed1f679a467f70e705aa98e201caa781.zip
chromium_src-7bee0b26ed1f679a467f70e705aa98e201caa781.tar.gz
chromium_src-7bee0b26ed1f679a467f70e705aa98e201caa781.tar.bz2
Cloud Print Proxy UI Lab
Expose the cloud print proxy UI command line switch through a lab (Windows only for now, others as we get the proxy and UI going there). BUG=none TEST=none Review URL: http://codereview.chromium.org/3599014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61523 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/generated_resources.grd6
-rw-r--r--chrome/browser/labs.cc7
2 files changed, 13 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index bad7636..6264011 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -3903,6 +3903,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_LABS_BACKGROUND_WEBAPPS_DESCRIPTION" desc="Description of the 'Background WebApps' lab.">
Allows installed web apps to run in the background at system startup and continue running after all windows are closed.
</message>
+ <message name="IDS_LABS_CLOUD_PRINT_PROXY_NAME" desc="Title of the Cloud Print Proxy lab">
+ Cloud Print Proxy
+ </message>
+ <message name="IDS_LABS_CLOUD_PRINT_PROXY_DESCRIPTION" desc="Description of the Cloud Print Proxy lab">
+ Enables a background service that connects the Google Cloud Print service to any printers installed on this computer. Once this lab is enabled, you can turn Cloud Print on by logging in with your Google account in the Options/Preferences in the Under the Hood section.
+ </message>
<!-- Click-to-load -->
<message name="IDS_PLUGIN_LOAD" desc="The link for loading a blocked plug-in, displayed in the click-to-play UI.">
diff --git a/chrome/browser/labs.cc b/chrome/browser/labs.cc
index 8ffd32e..d723f30 100644
--- a/chrome/browser/labs.cc
+++ b/chrome/browser/labs.cc
@@ -123,6 +123,13 @@ const Experiment kExperiments[] = {
IDS_LABS_BACKGROUND_WEBAPPS_DESCRIPTION,
kOsAll,
switches::kEnableBackgroundMode
+ },
+ {
+ "cloud-print-proxy", // Do not change; see above.
+ IDS_LABS_CLOUD_PRINT_PROXY_NAME,
+ IDS_LABS_CLOUD_PRINT_PROXY_DESCRIPTION,
+ kOsWin,
+ switches::kEnableCloudPrintProxy
}
};