diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-07 20:09:54 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-07 20:09:54 +0000 |
| commit | 94fbaa41f59f3dcb859627b698338d133fec1eb1 (patch) | |
| tree | f5ee660a40ee6fafc99eccd64a50645f57e44ea1 /printing | |
| parent | a8ca1a99ddee3b8c1c60bddb27c0c6b4893ec92a (diff) | |
| download | chromium_src-94fbaa41f59f3dcb859627b698338d133fec1eb1.zip chromium_src-94fbaa41f59f3dcb859627b698338d133fec1eb1.tar.gz chromium_src-94fbaa41f59f3dcb859627b698338d133fec1eb1.tar.bz2 | |
Get chrome to link with USE_AURA
http://crbug.com/93947
TEST=none
R=sadrul
TBR=jabdelmalek for the content/webkit stubs
Review URL: http://codereview.chromium.org/7841012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99993 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
| -rw-r--r-- | printing/printing.gyp | 6 | ||||
| -rw-r--r-- | printing/printing_context_win.cc | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/printing/printing.gyp b/printing/printing.gyp index bdcf0de..256108e 100644 --- a/printing/printing.gyp +++ b/printing/printing.gyp @@ -110,12 +110,6 @@ '../build/linux/system.gyp:gtkprint', ], }], - ['use_aura==1', { - 'sources/': [ - ['exclude', '^printing_context_win.cc'], - ['exclude', '^printing_context_win.h'], - ], - }], ['OS=="mac" and use_skia==0', { 'sources/': [ ['exclude', 'pdf_metafile_skia\\.(cc|h)$'], diff --git a/printing/printing_context_win.cc b/printing/printing_context_win.cc index 61f18ac..993b235 100644 --- a/printing/printing_context_win.cc +++ b/printing/printing_context_win.cc @@ -201,6 +201,7 @@ void PrintingContextWin::AskUserForSettings(gfx::NativeView view, int max_pages, bool has_selection, PrintSettingsCallback* callback) { +#if !defined(USE_AURA) DCHECK(!in_print_job_); dialog_box_dismissed_ = false; @@ -255,6 +256,7 @@ void PrintingContextWin::AskUserForSettings(gfx::NativeView view, // TODO(maruel): Support PD_PRINTTOFILE. callback->Run(ParseDialogResultEx(dialog_options)); +#endif } PrintingContext::Result PrintingContextWin::UseDefaultSettings() { |