diff options
| author | scottbyer@chromium.org <scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-08 16:47:58 +0000 |
|---|---|---|
| committer | scottbyer@chromium.org <scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-08 16:47:58 +0000 |
| commit | 65736d4a8d1baee42a139de7f69481d4206d06f8 (patch) | |
| tree | d1da3f814b640d61249d098eec93c90fe3838045 /chrome | |
| parent | 954ee6be6a31a19de9044e0eae491dfe9e5e1135 (diff) | |
| download | chromium_src-65736d4a8d1baee42a139de7f69481d4206d06f8.zip chromium_src-65736d4a8d1baee42a139de7f69481d4206d06f8.tar.gz chromium_src-65736d4a8d1baee42a139de7f69481d4206d06f8.tar.bz2 | |
Cloud Print Proxy UI tweaks.
For a Chrome build on Windows, turn on the Cloud Print Proxy UI
(removing the lab for that platform). It's still there for a Chromium
Windows build, but the proxy won't work unless you supply your own PDF
plug-in.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3616012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61966 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/labs.cc | 8 | ||||
| -rw-r--r-- | chrome/browser/views/options/advanced_contents_view.cc | 13 |
2 files changed, 19 insertions, 2 deletions
diff --git a/chrome/browser/labs.cc b/chrome/browser/labs.cc index 7c0024d..ec29df5 100644 --- a/chrome/browser/labs.cc +++ b/chrome/browser/labs.cc @@ -120,7 +120,15 @@ const Experiment kExperiments[] = { "cloud-print-proxy", // Do not change; see above. IDS_LABS_CLOUD_PRINT_PROXY_NAME, IDS_LABS_CLOUD_PRINT_PROXY_DESCRIPTION, +#if defined(GOOGLE_CHROME_BUILD) + // For a Chrome build, we know we have a PDF plug-in, and so we'll + // enable by platform as we get things working. + 0, +#else + // Otherwise, where we know it could be working if a viable PDF + // plug-in could be supplied, we'll keep the lab enabled. kOsWin, +#endif switches::kEnableCloudPrintProxy } }; diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc index d066c0f..0b0289d 100644 --- a/chrome/browser/views/options/advanced_contents_view.cc +++ b/chrome/browser/views/options/advanced_contents_view.cc @@ -1626,8 +1626,17 @@ void AdvancedContentsView::InitControlLayout() { layout->AddView(new WebContentSection(profile())); layout->StartRow(0, single_column_view_set_id); layout->AddView(new SecuritySection(profile())); - if (CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableCloudPrintProxy)) { +#if defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN) + // We want to enable the cloud print UI on Windows. Since the cloud + // print proxy on Windows needs the PDF plugin, we only enable it by + // default on Google Chrome Windows builds (which contain the PDF + // plugin). + bool cloud_print_available = true; +#else + bool cloud_print_available = CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableCloudPrintProxy); +#endif + if (cloud_print_available) { layout->StartRow(0, single_column_view_set_id); layout->AddView(new CloudPrintProxySection(profile())); } |