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 "ui/shell_dialogs/base_shell_dialog_win.h" | 5 #include "ui/shell_dialogs/base_shell_dialog_win.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/threading/thread.h" | 9 #include "base/threading/thread.h" |
10 #include "base/win/scoped_com_initializer.h" | 10 #include "base/win/scoped_com_initializer.h" |
(...skipping 12 matching lines...) Expand all Loading... |
23 // All runs should be complete by the time this is called! | 23 // All runs should be complete by the time this is called! |
24 if (--instance_count_ == 0) | 24 if (--instance_count_ == 0) |
25 DCHECK(owners_.empty()); | 25 DCHECK(owners_.empty()); |
26 } | 26 } |
27 | 27 |
28 BaseShellDialogImpl::RunState BaseShellDialogImpl::BeginRun(HWND owner) { | 28 BaseShellDialogImpl::RunState BaseShellDialogImpl::BeginRun(HWND owner) { |
29 // Cannot run a modal shell dialog if one is already running for this owner. | 29 // Cannot run a modal shell dialog if one is already running for this owner. |
30 DCHECK(!IsRunningDialogForOwner(owner)); | 30 DCHECK(!IsRunningDialogForOwner(owner)); |
31 // The owner must be a top level window, otherwise we could end up with two | 31 // The owner must be a top level window, otherwise we could end up with two |
32 // entries in our map for the same top level window. | 32 // entries in our map for the same top level window. |
33 DCHECK(!owner || owner == GetAncestor(owner, GA_ROOT)); | 33 // TODO(scottmg): This should be re-enabled when Chrome Frame is removed. |
| 34 // http://crbug.com/310264 |
| 35 // DCHECK(!owner || owner == GetAncestor(owner, GA_ROOT)); |
34 RunState run_state; | 36 RunState run_state; |
35 run_state.dialog_thread = CreateDialogThread(); | 37 run_state.dialog_thread = CreateDialogThread(); |
36 run_state.owner = owner; | 38 run_state.owner = owner; |
37 if (owner) { | 39 if (owner) { |
38 owners_.insert(owner); | 40 owners_.insert(owner); |
39 DisableOwner(owner); | 41 DisableOwner(owner); |
40 } | 42 } |
41 return run_state; | 43 return run_state; |
42 } | 44 } |
43 | 45 |
(...skipping 25 matching lines...) Expand all Loading... |
69 DCHECK(started); | 71 DCHECK(started); |
70 return thread; | 72 return thread; |
71 } | 73 } |
72 | 74 |
73 void BaseShellDialogImpl::EnableOwner(HWND owner) { | 75 void BaseShellDialogImpl::EnableOwner(HWND owner) { |
74 if (IsWindow(owner)) | 76 if (IsWindow(owner)) |
75 EnableWindow(owner, TRUE); | 77 EnableWindow(owner, TRUE); |
76 } | 78 } |
77 | 79 |
78 } // namespace ui | 80 } // namespace ui |
OLD | NEW |