diff options
| author | abeera@google.com <abeera@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-20 02:15:22 +0000 |
|---|---|---|
| committer | abeera@google.com <abeera@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-20 02:15:22 +0000 |
| commit | 4fa24bfa0b637b34d92432c98b318362b014c540 (patch) | |
| tree | de37e3d92fa57e56178a8df0c5640c03abb61025 /chrome/browser/ui/webui | |
| parent | 43c9dc728d4a0c3713364487211f6a2b8dbe2f0a (diff) | |
| download | chromium_src-4fa24bfa0b637b34d92432c98b318362b014c540.zip chromium_src-4fa24bfa0b637b34d92432c98b318362b014c540.tar.gz chromium_src-4fa24bfa0b637b34d92432c98b318362b014c540.tar.bz2 | |
Bring out cloud print proxy from behind a flag on Linux.
BUG=NONE
TEST=The cloud print proxy is available under options on Linux without the command line flag.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=93683
Review URL: http://codereview.chromium.org/7277018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97546 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui')
| -rw-r--r-- | chrome/browser/ui/webui/options/advanced_options_handler.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/chrome/browser/ui/webui/options/advanced_options_handler.cc b/chrome/browser/ui/webui/options/advanced_options_handler.cc index 780512b..40d75a0 100644 --- a/chrome/browser/ui/webui/options/advanced_options_handler.cc +++ b/chrome/browser/ui/webui/options/advanced_options_handler.cc @@ -43,12 +43,17 @@ #endif AdvancedOptionsHandler::AdvancedOptionsHandler() { -#if (defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN)) || defined(OS_MACOSX) + +#if(!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); +#elif(!defined(OS_CHROMEOS)) + // Always enabled for Mac, Linux and Google Chrome Windows builds. + // Never enabled for Chrome OS, we don't even need to indicate it. cloud_print_proxy_ui_enabled_ = true; -#elif !defined(OS_CHROMEOS) - cloud_print_proxy_ui_enabled_ = - CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableCloudPrintProxy); #endif } |