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 <set> | 5 #include <set> |
6 | 6 |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
8 #include "chrome/browser/platform_util.h" | 8 #include "chrome/browser/platform_util.h" |
9 #include "chrome/browser/ui/native_web_contents_modal_dialog_manager.h" | |
10 #include "chrome/browser/ui/views/constrained_window_views.h" | 9 #include "chrome/browser/ui/views/constrained_window_views.h" |
11 #include "chrome/browser/ui/web_contents_modal_dialog_manager.h" | 10 #include "components/web_modal/native_web_contents_modal_dialog_manager.h" |
| 11 #include "components/web_modal/web_contents_modal_dialog_manager.h" |
12 #include "content/public/browser/web_contents_view.h" | 12 #include "content/public/browser/web_contents_view.h" |
13 #include "ui/views/widget/widget.h" | 13 #include "ui/views/widget/widget.h" |
14 #include "ui/views/widget/widget_delegate.h" | 14 #include "ui/views/widget/widget_delegate.h" |
15 #include "ui/views/widget/widget_observer.h" | 15 #include "ui/views/widget/widget_observer.h" |
16 #include "ui/views/window/dialog_delegate.h" | 16 #include "ui/views/window/dialog_delegate.h" |
17 | 17 |
18 #if defined(USE_AURA) | 18 #if defined(USE_AURA) |
19 #include "ui/aura/client/aura_constants.h" | 19 #include "ui/aura/client/aura_constants.h" |
20 #include "ui/aura/window.h" | 20 #include "ui/aura/window.h" |
21 #include "ui/views/corewm/visibility_controller.h" | 21 #include "ui/views/corewm/visibility_controller.h" |
22 #include "ui/views/corewm/window_animations.h" | 22 #include "ui/views/corewm/window_animations.h" |
23 #include "ui/views/corewm/window_modality_controller.h" | 23 #include "ui/views/corewm/window_modality_controller.h" |
24 #endif | 24 #endif |
25 | 25 |
26 #if defined(USE_ASH) | 26 #if defined(USE_ASH) |
27 #include "ash/ash_constants.h" | 27 #include "ash/ash_constants.h" |
28 #include "ash/shell.h" | 28 #include "ash/shell.h" |
29 #include "ash/wm/custom_frame_view_ash.h" | 29 #include "ash/wm/custom_frame_view_ash.h" |
30 #endif | 30 #endif |
31 | 31 |
| 32 using web_modal::NativeWebContentsModalDialog; |
| 33 using web_modal::NativeWebContentsModalDialogManager; |
| 34 using web_modal::NativeWebContentsModalDialogManagerDelegate; |
| 35 |
32 namespace { | 36 namespace { |
33 | 37 |
34 class NativeWebContentsModalDialogManagerViews | 38 class NativeWebContentsModalDialogManagerViews |
35 : public NativeWebContentsModalDialogManager, | 39 : public NativeWebContentsModalDialogManager, |
36 public views::WidgetObserver { | 40 public views::WidgetObserver { |
37 public: | 41 public: |
38 NativeWebContentsModalDialogManagerViews( | 42 NativeWebContentsModalDialogManagerViews( |
39 NativeWebContentsModalDialogManagerDelegate* native_delegate) | 43 NativeWebContentsModalDialogManagerDelegate* native_delegate) |
40 : native_delegate_(native_delegate) { | 44 : native_delegate_(native_delegate) { |
41 } | 45 } |
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
180 | 184 |
181 NativeWebContentsModalDialogManagerDelegate* native_delegate_; | 185 NativeWebContentsModalDialogManagerDelegate* native_delegate_; |
182 std::set<views::Widget*> observed_widgets_; | 186 std::set<views::Widget*> observed_widgets_; |
183 std::set<views::Widget*> shown_widgets_; | 187 std::set<views::Widget*> shown_widgets_; |
184 | 188 |
185 DISALLOW_COPY_AND_ASSIGN(NativeWebContentsModalDialogManagerViews); | 189 DISALLOW_COPY_AND_ASSIGN(NativeWebContentsModalDialogManagerViews); |
186 }; | 190 }; |
187 | 191 |
188 } // namespace | 192 } // namespace |
189 | 193 |
| 194 namespace web_modal { |
| 195 |
190 NativeWebContentsModalDialogManager* WebContentsModalDialogManager:: | 196 NativeWebContentsModalDialogManager* WebContentsModalDialogManager:: |
191 CreateNativeManager( | 197 CreateNativeManager( |
192 NativeWebContentsModalDialogManagerDelegate* native_delegate) { | 198 NativeWebContentsModalDialogManagerDelegate* native_delegate) { |
193 return new NativeWebContentsModalDialogManagerViews(native_delegate); | 199 return new NativeWebContentsModalDialogManagerViews(native_delegate); |
194 } | 200 } |
| 201 |
| 202 } // namespace web_modal |
OLD | NEW |