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

Unified Diff: chrome/browser/browser_process_impl.cc

Issue 9447086: Android: Don't compile printing sources (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Addressed jam's comment Created 8 years, 10 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
Index: chrome/browser/browser_process_impl.cc
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index bd4ed32913f6a810314b8ae929456d95abeef212..d787b6c4119e4ef23041dc01f717fe2ce8fa1c1d 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -132,8 +132,10 @@ BrowserProcessImpl::BrowserProcessImpl(const CommandLine& command_line)
g_browser_process = this;
clipboard_.reset(new ui::Clipboard);
+#if !defined(OS_ANDROID)
// Must be created after the NotificationService.
print_job_manager_.reset(new printing::PrintJobManager);
+#endif
net_log_.reset(new ChromeNetLog);
@@ -148,9 +150,11 @@ BrowserProcessImpl::BrowserProcessImpl(const CommandLine& command_line)
}
BrowserProcessImpl::~BrowserProcessImpl() {
+#if !defined(OS_ANDROID)
// Wait for the pending print jobs to finish.
print_job_manager_->OnQuit();
print_job_manager_.reset();
+#endif
tracked_objects::ThreadData::EnsureCleanupWasCalled(4);
@@ -464,18 +468,28 @@ printing::PrintJobManager* BrowserProcessImpl::print_job_manager() {
printing::PrintPreviewTabController*
BrowserProcessImpl::print_preview_tab_controller() {
+#if defined(OS_ANDROID)
+ NOTIMPLEMENTED();
+ return NULL;
+#else
DCHECK(CalledOnValidThread());
if (!print_preview_tab_controller_.get())
CreatePrintPreviewTabController();
return print_preview_tab_controller_.get();
+#endif
}
printing::BackgroundPrintingManager*
BrowserProcessImpl::background_printing_manager() {
+#if defined(OS_ANDROID)
+ NOTIMPLEMENTED();
+ return NULL;
+#else
DCHECK(CalledOnValidThread());
if (!background_printing_manager_.get())
CreateBackgroundPrintingManager();
return background_printing_manager_.get();
+#endif
}
GoogleURLTracker* BrowserProcessImpl::google_url_tracker() {
@@ -675,7 +689,9 @@ void BrowserProcessImpl::CreateLocalState() {
pref_change_registrar_.Init(local_state_.get());
+#if !defined(OS_ANDROID)
print_job_manager_->InitOnUIThread(local_state_.get());
+#endif
// Initialize the notification for the default browser setting policy.
local_state_->RegisterBooleanPref(prefs::kDefaultBrowserSettingEnabled,
@@ -782,8 +798,12 @@ void BrowserProcessImpl::CreateStatusTray() {
}
void BrowserProcessImpl::CreatePrintPreviewTabController() {
+#if defined(OS_ANDROID)
+ NOTIMPLEMENTED();
+#else
DCHECK(print_preview_tab_controller_.get() == NULL);
print_preview_tab_controller_ = new printing::PrintPreviewTabController();
+#endif
}
void BrowserProcessImpl::CreateBackgroundPrintingManager() {
« no previous file with comments | « no previous file | chrome/browser/chrome_browser_main.cc » ('j') | chrome/browser/ui/tab_contents/tab_contents_wrapper.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698