diff options
| author | scottbyer@chromium.org <scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-30 21:47:19 +0000 |
|---|---|---|
| committer | scottbyer@chromium.org <scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-30 21:47:19 +0000 |
| commit | fa6d2a2fef45fce6247c3ca8f33724e95a2c96b7 (patch) | |
| tree | 107e7a18bdafc19550747fa5093418d5000392cb /chrome/browser/ui | |
| parent | 7490c6d7bc121c3e32fe82d4d84a35fef71fb6d0 (diff) | |
| download | chromium_src-fa6d2a2fef45fce6247c3ca8f33724e95a2c96b7.zip chromium_src-fa6d2a2fef45fce6247c3ca8f33724e95a2c96b7.tar.gz chromium_src-fa6d2a2fef45fce6247c3ca8f33724e95a2c96b7.tar.bz2 | |
Expose Cloud Print UI inside Chrome options.
For official Windows builds only, remove the flag and turn on the cloud print
proxy setup UI.
BUG=60092
TEST=On an official Windows build, cloud print gone from about:flags, present in both tabbed and untabbed options (under the hood).
Review URL: http://codereview.chromium.org/5409001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67765 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui')
| -rw-r--r-- | chrome/browser/ui/views/options/advanced_contents_view.cc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/chrome/browser/ui/views/options/advanced_contents_view.cc b/chrome/browser/ui/views/options/advanced_contents_view.cc index 762251e..5982ee6 100644 --- a/chrome/browser/ui/views/options/advanced_contents_view.cc +++ b/chrome/browser/ui/views/options/advanced_contents_view.cc @@ -1572,8 +1572,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 && profile()->GetCloudPrintProxyService()) { layout->StartRow(0, single_column_view_set_id); layout->AddView(new CloudPrintProxySection(profile())); |