Index: chrome/browser/ui/webui/options/advanced_options_handler.cc |
diff --git a/chrome/browser/ui/webui/options/advanced_options_handler.cc b/chrome/browser/ui/webui/options/advanced_options_handler.cc |
index 1aefe605018b9cd5939eb798c82e649023c47d50..682687af2806549773c98991628cb8cd243435d3 100644 |
--- a/chrome/browser/ui/webui/options/advanced_options_handler.cc |
+++ b/chrome/browser/ui/webui/options/advanced_options_handler.cc |
@@ -42,12 +42,16 @@ |
#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. |
cloud_print_proxy_ui_enabled_ = true; |
-#elif !defined(OS_CHROMEOS) |
- cloud_print_proxy_ui_enabled_ = |
- CommandLine::ForCurrentProcess()->HasSwitch( |
- switches::kEnableCloudPrintProxy); |
#endif |
} |