diff options
author | scottbyer@chromium.org <scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-15 20:46:01 +0000 |
---|---|---|
committer | scottbyer@chromium.org <scottbyer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-15 20:46:01 +0000 |
commit | 9062e85d56308d06cfb0926b0eedee313283a44d (patch) | |
tree | cd0cfd2baa78fe35be6476aa5dc09bb92f764b76 /chrome/browser/views/options | |
parent | bfbceb70b98dc5cdaae9f0774cb087508a4d0927 (diff) | |
download | chromium_src-9062e85d56308d06cfb0926b0eedee313283a44d.zip chromium_src-9062e85d56308d06cfb0926b0eedee313283a44d.tar.gz chromium_src-9062e85d56308d06cfb0926b0eedee313283a44d.tar.bz2 |
Move Cloud Print Proxy UI back to about:flags.
BUG=59296, 59297
TEST=UI does not show up on Windows anymore unless you have the flag on.
Review URL: http://codereview.chromium.org/3748008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62788 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/options')
-rw-r--r-- | chrome/browser/views/options/advanced_contents_view.cc | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc index 50ca605..e541c58 100644 --- a/chrome/browser/views/options/advanced_contents_view.cc +++ b/chrome/browser/views/options/advanced_contents_view.cc @@ -1673,17 +1673,8 @@ void AdvancedContentsView::InitControlLayout() { layout->AddView(new WebContentSection(profile())); layout->StartRow(0, single_column_view_set_id); layout->AddView(new SecuritySection(profile())); -#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) { + if (CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableCloudPrintProxy)) { layout->StartRow(0, single_column_view_set_id); layout->AddView(new CloudPrintProxySection(profile())); } |