Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1228)

Unified Diff: chrome/test/base/testing_browser_process.cc

Issue 10540033: Add ENABLE_PRINTING and disable it on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Arrange some ifdefs Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/renderer/pepper/ppb_pdf_impl.cc ('k') | chrome/utility/chrome_content_utility_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/testing_browser_process.cc
diff --git a/chrome/test/base/testing_browser_process.cc b/chrome/test/base/testing_browser_process.cc
index 8ae4c44472d27c6c91f6156dd28ff4fd02827c6f..9f368f71cc9d169412ab5672c2546a6117d708d0 100644
--- a/chrome/test/base/testing_browser_process.cc
+++ b/chrome/test/base/testing_browser_process.cc
@@ -188,27 +188,27 @@ printing::PrintJobManager* TestingBrowserProcess::print_job_manager() {
printing::PrintPreviewTabController*
TestingBrowserProcess::print_preview_tab_controller() {
-#if defined(OS_ANDROID)
- NOTIMPLEMENTED();
- return NULL;
-#else
+#if defined(ENABLE_PRINTING)
if (!print_preview_tab_controller_.get())
print_preview_tab_controller_ = new printing::PrintPreviewTabController();
return print_preview_tab_controller_.get();
+#else
+ NOTIMPLEMENTED();
+ return NULL;
#endif
}
printing::BackgroundPrintingManager*
TestingBrowserProcess::background_printing_manager() {
-#if defined(OS_ANDROID)
- NOTIMPLEMENTED();
- return NULL;
-#else
+#if defined(ENABLE_PRINTING)
if (!background_printing_manager_.get()) {
background_printing_manager_.reset(
new printing::BackgroundPrintingManager());
}
return background_printing_manager_.get();
+#else
+ NOTIMPLEMENTED();
+ return NULL;
#endif
}
« no previous file with comments | « chrome/renderer/pepper/ppb_pdf_impl.cc ('k') | chrome/utility/chrome_content_utility_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698