diff options
| author | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-14 16:08:56 +0000 |
|---|---|---|
| committer | mukai@chromium.org <mukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-14 16:08:56 +0000 |
| commit | d53002f4644264467e8b37d720f3b21e05c78ccc (patch) | |
| tree | c33814f8b2a1e0d5a146b1a42d1d01162e345248 /printing/printing.gyp | |
| parent | 2dab894b43840d5f8dbd8afaae409edf9b03fa78 (diff) | |
| download | chromium_src-d53002f4644264467e8b37d720f3b21e05c78ccc.zip chromium_src-d53002f4644264467e8b37d720f3b21e05c78ccc.tar.gz chromium_src-d53002f4644264467e8b37d720f3b21e05c78ccc.tar.bz2 | |
Allows gtk2 printing dialog in Linux-Aura.
A todo is the parent/dialog relationship. Right now print_dialog_gtk2
creates the dialog with NULL parent, so the dialog can move under the
browser window.
We need to do something similar to select_file_dialog_impl_gtk2.cc
BUG=317882
R=erg@chromium.org, thestig@chromium.org, vitalybuka@chromium.org
TEST=manually
Review URL: https://codereview.chromium.org/135163003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244734 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing/printing.gyp')
| -rw-r--r-- | printing/printing.gyp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/printing/printing.gyp b/printing/printing.gyp index 3862fa2..535e018 100644 --- a/printing/printing.gyp +++ b/printing/printing.gyp @@ -78,7 +78,7 @@ 'print_settings_initializer_win.h', 'printed_document.cc', 'printed_document.h', - 'printed_document_gtk.cc', + 'printed_document_linux.cc', 'printed_document_mac.cc', 'printed_document_win.cc', 'printed_page.cc', @@ -158,7 +158,7 @@ 'print_destination_none.cc', ], }], - ['chromeos==1 or (use_aura==1 and OS!="win")',{ + ['chromeos==1',{ 'sources': [ 'printing_context_no_system_dialog.cc', 'printing_context_no_system_dialog.h', @@ -222,10 +222,10 @@ 'backend/print_backend_chromeos.cc', ], }], - ['toolkit_uses_gtk==1 and chromeos==0', { + ['OS=="linux" and chromeos==0', { 'sources': [ - 'printing_context_gtk.cc', - 'printing_context_gtk.h', + 'printing_context_linux.cc', + 'printing_context_linux.h', ], }], ['OS=="android"', { |