Linux: Don't call printing::GetColorModelForMode() when USE_CUPS is n…

…ot defined. BUG=103183 TEST=none Review URL: http://codereview.chromium.org/8496004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109091 0039d316-1c4b-4281-b951-d872f2087c98
Denger-Network · Nov 8, 2011 · fa879e5 · fa879e5
1 parent 4b3d192
commit fa879e5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/chrome/browser/printing/print_dialog_gtk.cc b/chrome/browser/printing/print_dialog_gtk.cc
@@ -191,6 +191,7 @@ bool PrintDialogGtk::UpdateSettings(const DictionaryValue& job_settings,
     gtk_print_settings_set_n_copies(gtk_settings_, copies);
     gtk_print_settings_set_collate(gtk_settings_, collate);
 
+#if defined(USE_CUPS)
     std::string color_value;
     std::string color_setting_name;
     printing::GetColorModelForMode(color, &color_setting_name, &color_value);
@@ -214,6 +215,7 @@ bool PrintDialogGtk::UpdateSettings(const DictionaryValue& job_settings,
           break;
       }
       gtk_print_settings_set(gtk_settings_, kCUPSDuplex, cups_duplex_mode);
+#endif
     }
   }
   if (!page_setup_)

diff --git a/printing/print_settings.cc b/printing/print_settings.cc
@@ -11,7 +11,7 @@
 
 namespace printing {
 
-#if defined (USE_CUPS)
+#if defined(USE_CUPS)
 void GetColorModelForMode(
     int color_mode, std::string* color_setting_name, std::string* color_value) {
 #if defined(OS_MACOSX)
@@ -24,7 +24,7 @@ void GetColorModelForMode(
   const char kCUPSColorModel[] = "cups-ColorModel";
   const char kCUPSPrintoutMode[] = "cups-PrintoutMode";
   const char kCUPSProcessColorModel[] = "cups-ProcessColorModel";
-#endif
+#endif  // defined(OS_MACOSX)
 
   color_setting_name->assign(kCUPSColorModel);
   switch (color_mode) {
@@ -96,7 +96,7 @@ void GetColorModelForMode(
       break;
   }
 }
-#endif
+#endif  // defined(USE_CUPS)
 
 bool isColorModelSelected(int model) {
   return (model != GRAY &&

diff --git a/printing/print_settings.h b/printing/print_settings.h
@@ -20,11 +20,11 @@ namespace printing {
 // Returns true if color model is selected.
 PRINTING_EXPORT bool isColorModelSelected(int model);
 
-#if defined (USE_CUPS)
-  // Get the color model setting name and value for the |color_mode|.
-  PRINTING_EXPORT  void GetColorModelForMode(int color_mode,
-                                             std::string* color_setting_name,
-                                             std::string* color_value);
+#if defined(USE_CUPS)
+// Get the color model setting name and value for the |color_mode|.
+PRINTING_EXPORT void GetColorModelForMode(int color_mode,
+                                          std::string* color_setting_name,
+                                          std::string* color_value);
 #endif
 
 // OS-independent print settings.