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

Unified Diff: printing/printing.gyp

Issue 15817004: Enabled system print dialog on Windows Aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 7 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 | « printing/DEPS ('k') | printing/printing_context_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: printing/printing.gyp
diff --git a/printing/printing.gyp b/printing/printing.gyp
index be4d88356d6100948a6525112e6934ad92bd4d74..2ec12097b45d7120fa1d3b7df655bc13123cd370 100644
--- a/printing/printing.gyp
+++ b/printing/printing.gyp
@@ -97,6 +97,11 @@
['exclude', '.'],
],
}],
+ ['use_aura==1', {
+ 'dependencies': [
+ '<(DEPTH)/ui/aura/aura.gyp:aura',
+ ],
+ }],
['toolkit_uses_gtk == 0',{
'sources/': [['exclude', '_cairo\\.cc$']]
}],
@@ -132,10 +137,9 @@
'../win8/win8.gyp:win8_util',
],
'conditions': [
- ['use_aura==0', {
- 'sources': [
- 'printing_context_win.cc',
- 'printing_context_win.h',
+ ['use_aura==1', {
+ 'dependencies': [
+ '<(DEPTH)/ui/aura/aura.gyp:aura',
],
}]],
'defines': [
@@ -147,12 +151,14 @@
'backend/win_helper.cc',
'backend/win_helper.h',
'backend/print_backend_win.cc',
+ 'printing_context_win.cc',
+ 'printing_context_win.h',
],
'sources!': [
'print_destination_none.cc',
],
}],
- ['chromeos==1 or use_aura==1',{
+ ['chromeos==1 or (use_aura==1 and OS!="win")',{
'sources': [
'printing_context_no_system_dialog.cc',
'printing_context_no_system_dialog.h',
« no previous file with comments | « printing/DEPS ('k') | printing/printing_context_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698