diff options
| author | mohsen <mohsen@chromium.org> | 2015-11-24 14:18:13 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-24 22:19:09 +0000 |
| commit | 51c57d47de3048ef68aca39f9d9ec4e76fe03944 (patch) | |
| tree | 7f02eae363ddc746d6eaf4e21ffa5805a409b6b5 | |
| parent | a2547bc77e719be01d831f43dc6138474775ca81 (diff) | |
| download | chromium_src-51c57d47de3048ef68aca39f9d9ec4e76fe03944.zip chromium_src-51c57d47de3048ef68aca39f9d9ec4e76fe03944.tar.gz chromium_src-51c57d47de3048ef68aca39f9d9ec4e76fe03944.tar.bz2 | |
Make chrome/browser/printing compile on Aura Android
This is to allow compiling Chrome for Android with use_aura=1.
BUG=507792
Review URL: https://codereview.chromium.org/1476433003
Cr-Commit-Position: refs/heads/master@{#361468}
| -rw-r--r-- | chrome/browser/printing/print_job_worker.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/printing/printing_message_filter.cc | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc index 4648e1f..771ce18 100644 --- a/chrome/browser/printing/print_job_worker.cc +++ b/chrome/browser/printing/print_job_worker.cc @@ -27,7 +27,7 @@ #include "printing/printing_utils.h" #include "ui/base/l10n/l10n_util.h" -#if defined(OS_ANDROID) +#if defined(OS_ANDROID) && !defined(USE_AURA) #include "chrome/browser/android/tab_android.h" #endif @@ -213,7 +213,7 @@ void PrintJobWorker::GetSettingsWithUI( bool is_scripted) { DCHECK_CURRENTLY_ON(BrowserThread::UI); -#if defined(OS_ANDROID) +#if defined(OS_ANDROID) && !defined(USE_AURA) if (is_scripted) { PrintingContextDelegate* printing_context_delegate = static_cast<PrintingContextDelegate*>(printing_context_delegate_.get()); diff --git a/chrome/browser/printing/printing_message_filter.cc b/chrome/browser/printing/printing_message_filter.cc index 969eec5..b0f2813 100644 --- a/chrome/browser/printing/printing_message_filter.cc +++ b/chrome/browser/printing/printing_message_filter.cc @@ -34,7 +34,6 @@ #if defined(OS_ANDROID) #include "base/strings/string_number_conversions.h" -#include "chrome/browser/android/tab_android.h" #include "chrome/browser/printing/print_view_manager_basic.h" #endif |