diff options
| author | dpapad@chromium.org <dpapad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-01 01:02:53 +0000 |
|---|---|---|
| committer | dpapad@chromium.org <dpapad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-01 01:02:53 +0000 |
| commit | 6a18e2b144977422e73f79571750cd83f7104e27 (patch) | |
| tree | f62a9d9598f3e8e944afc2fbd143a56a495f0341 | |
| parent | ac2a5afcc142c05869a455757f66fa0035aa52af (diff) | |
| download | chromium_src-6a18e2b144977422e73f79571750cd83f7104e27.zip chromium_src-6a18e2b144977422e73f79571750cd83f7104e27.tar.gz chromium_src-6a18e2b144977422e73f79571750cd83f7104e27.tar.bz2 | |
Revert 91247 - Bring out cloud print proxy from behind a flag on Linux.
BUG=NONE
TEST=NONE
Review URL: http://codereview.chromium.org/7277018
TBR=abeera@google.com
Review URL: http://codereview.chromium.org/7292023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91248 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/about_flags.cc | 12 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/options/advanced_options_handler.cc | 17 |
2 files changed, 12 insertions, 17 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 6626ed7..9e3f1d9 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -114,13 +114,15 @@ const Experiment kExperiments[] = { "cloud-print-proxy", // FLAGS:RECORD_UMA IDS_FLAGS_CLOUD_PRINT_PROXY_NAME, IDS_FLAGS_CLOUD_PRINT_PROXY_DESCRIPTION, -#if !defined(GOOGLE_CHROME_BUILD) +#if defined(GOOGLE_CHROME_BUILD) // For a Chrome build, we know we have a PDF plug-in on Windows, so it's - // fully enabled. + // fully enabled. Linux still need some final polish. + kOsLinux, +#else // Otherwise, where we know Windows could be working if a viable PDF - // plug-in could be supplied, we'll keep the lab enabled. Mac and Linux - // always have PDF rasterization available, so no flag needed there. - kOsWin, + // plug-in could be supplied, we'll keep the lab enabled. Mac always has + // PDF rasterization available, so no flag needed there. + kOsWin | kOsLinux, #endif SINGLE_VALUE_TYPE(switches::kEnableCloudPrintProxy) }, diff --git a/chrome/browser/ui/webui/options/advanced_options_handler.cc b/chrome/browser/ui/webui/options/advanced_options_handler.cc index 2c7f5e8..fd9e0c2 100644 --- a/chrome/browser/ui/webui/options/advanced_options_handler.cc +++ b/chrome/browser/ui/webui/options/advanced_options_handler.cc @@ -42,19 +42,12 @@ #endif AdvancedOptionsHandler::AdvancedOptionsHandler() { - -#if defined(OS_CHROMEOS) - // Proxy never enabled on Chrome OS. - cloud_print_proxy_ui_enabled_ = false; -#elif(!defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN)) - // On Windows, we need the PDF plugin which is only guaranteed to exist on - // Google Chrome builds. Use a command-line switch for Windows non-Google - // Chrome builds. - cloud_print_proxy_ui_enabled_ = CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableCloudPrintProxy); -#else - // Always enabled for Mac, Linux and Google Chrome Windows builds. +#if (defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN)) || defined(OS_MACOSX) cloud_print_proxy_ui_enabled_ = true; +#elif !defined(OS_CHROMEOS) + cloud_print_proxy_ui_enabled_ = + CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableCloudPrintProxy); #endif } |