| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/printing/print_dialog_cloud.h" | 5 #include "chrome/browser/printing/print_dialog_cloud.h" |
| 6 | 6 |
| 7 | 7 |
| 8 #include "base/base64.h" | 8 #include "base/base64.h" |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 629 #if defined(OS_WIN) | 629 #if defined(OS_WIN) |
| 630 gfx::NativeWindow window = | 630 gfx::NativeWindow window = |
| 631 #endif | 631 #endif |
| 632 chrome::ShowWebDialog(modal_parent, | 632 chrome::ShowWebDialog(modal_parent, |
| 633 Profile::FromBrowserContext(browser_context), | 633 Profile::FromBrowserContext(browser_context), |
| 634 dialog_delegate); | 634 dialog_delegate); |
| 635 #if defined(OS_WIN) | 635 #if defined(OS_WIN) |
| 636 if (window) { | 636 if (window) { |
| 637 HWND dialog_handle; | 637 HWND dialog_handle; |
| 638 #if defined(USE_AURA) | 638 #if defined(USE_AURA) |
| 639 dialog_handle = window->GetRootWindow()->GetAcceleratedWidget(); | 639 dialog_handle = window->GetDispatcher()->GetAcceleratedWidget(); |
| 640 #else | 640 #else |
| 641 dialog_handle = window; | 641 dialog_handle = window; |
| 642 #endif | 642 #endif |
| 643 if (::GetForegroundWindow() != dialog_handle) { | 643 if (::GetForegroundWindow() != dialog_handle) { |
| 644 ui::ForegroundHelper::SetForeground(dialog_handle); | 644 ui::ForegroundHelper::SetForeground(dialog_handle); |
| 645 } | 645 } |
| 646 } | 646 } |
| 647 #endif | 647 #endif |
| 648 } | 648 } |
| 649 | 649 |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 778 print_job_print_ticket, | 778 print_job_print_ticket, |
| 779 file_type, | 779 file_type, |
| 780 delete_on_close); | 780 delete_on_close); |
| 781 return true; | 781 return true; |
| 782 } | 782 } |
| 783 } | 783 } |
| 784 return false; | 784 return false; |
| 785 } | 785 } |
| 786 | 786 |
| 787 } // end namespace | 787 } // end namespace |
| OLD | NEW |