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

Side by Side Diff: chrome/browser/ui/views/web_contents_modal_dialog_manager_views.cc

Issue 231173004: [WebModal] Rename NativeWebContentsModalDialogManager to SingleWebContentsDialogManager. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/views/constrained_window_views.h" 9 #include "chrome/browser/ui/views/constrained_window_views.h"
10 #include "components/web_modal/native_web_contents_modal_dialog_manager.h" 10 #include "components/web_modal/single_web_contents_dialog_manager.h"
11 #include "components/web_modal/web_contents_modal_dialog_host.h" 11 #include "components/web_modal/web_contents_modal_dialog_host.h"
12 #include "components/web_modal/web_contents_modal_dialog_manager.h" 12 #include "components/web_modal/web_contents_modal_dialog_manager.h"
13 #include "content/public/browser/web_contents_view.h" 13 #include "content/public/browser/web_contents_view.h"
14 #include "ui/gfx/point.h" 14 #include "ui/gfx/point.h"
15 #include "ui/gfx/size.h" 15 #include "ui/gfx/size.h"
16 #include "ui/views/border.h" 16 #include "ui/views/border.h"
17 #include "ui/views/widget/widget.h" 17 #include "ui/views/widget/widget.h"
18 #include "ui/views/widget/widget_delegate.h" 18 #include "ui/views/widget/widget_delegate.h"
19 #include "ui/views/widget/widget_observer.h" 19 #include "ui/views/widget/widget_observer.h"
20 #include "ui/views/window/dialog_delegate.h" 20 #include "ui/views/window/dialog_delegate.h"
21 #include "ui/views/window/non_client_view.h" 21 #include "ui/views/window/non_client_view.h"
22 22
23 #if defined(USE_AURA) 23 #if defined(USE_AURA)
24 #include "ui/aura/client/aura_constants.h" 24 #include "ui/aura/client/aura_constants.h"
25 #include "ui/aura/window.h" 25 #include "ui/aura/window.h"
26 #include "ui/wm/core/visibility_controller.h" 26 #include "ui/wm/core/visibility_controller.h"
27 #include "ui/wm/core/window_animations.h" 27 #include "ui/wm/core/window_animations.h"
28 #include "ui/wm/core/window_modality_controller.h" 28 #include "ui/wm/core/window_modality_controller.h"
29 #endif 29 #endif
30 30
31 // TODO(wittman): this code should not depend on ash. 31 // TODO(wittman): this code should not depend on ash.
32 #if defined(USE_ASH) 32 #if defined(USE_ASH)
33 #include "ash/ash_constants.h" 33 #include "ash/ash_constants.h"
34 #include "ash/frame/custom_frame_view_ash.h" 34 #include "ash/frame/custom_frame_view_ash.h"
35 #include "ash/shell.h" 35 #include "ash/shell.h"
36 #endif 36 #endif
37 37
38 using web_modal::NativeWebContentsModalDialog; 38 using web_modal::NativeWebContentsModalDialog;
39 using web_modal::NativeWebContentsModalDialogManager; 39 using web_modal::SingleWebContentsDialogManager;
40 using web_modal::NativeWebContentsModalDialogManagerDelegate; 40 using web_modal::SingleWebContentsDialogManagerDelegate;
41 using web_modal::WebContentsModalDialogHost; 41 using web_modal::WebContentsModalDialogHost;
42 using web_modal::ModalDialogHostObserver; 42 using web_modal::ModalDialogHostObserver;
43 43
44 namespace { 44 namespace {
45 45
46 class NativeWebContentsModalDialogManagerViews 46 class NativeWebContentsModalDialogManagerViews
47 : public NativeWebContentsModalDialogManager, 47 : public SingleWebContentsDialogManager,
48 public ModalDialogHostObserver, 48 public ModalDialogHostObserver,
49 public views::WidgetObserver { 49 public views::WidgetObserver {
50 public: 50 public:
51 NativeWebContentsModalDialogManagerViews( 51 NativeWebContentsModalDialogManagerViews(
52 NativeWebContentsModalDialogManagerDelegate* native_delegate) 52 SingleWebContentsDialogManagerDelegate* native_delegate)
53 : native_delegate_(native_delegate), 53 : native_delegate_(native_delegate),
54 host_(NULL) { 54 host_(NULL) {
55 } 55 }
56 56
57 virtual ~NativeWebContentsModalDialogManagerViews() { 57 virtual ~NativeWebContentsModalDialogManagerViews() {
58 if (host_) 58 if (host_)
59 host_->RemoveObserver(this); 59 host_->RemoveObserver(this);
60 60
61 for (std::set<views::Widget*>::iterator it = observed_widgets_.begin(); 61 for (std::set<views::Widget*>::iterator it = observed_widgets_.begin();
62 it != observed_widgets_.end(); 62 it != observed_widgets_.end();
63 ++it) { 63 ++it) {
64 (*it)->RemoveObserver(this); 64 (*it)->RemoveObserver(this);
65 } 65 }
66 } 66 }
67 67
68 // NativeWebContentsModalDialogManager overrides 68 // SingleWebContentsDialogManager overrides
69 virtual void ManageDialog(NativeWebContentsModalDialog dialog) OVERRIDE { 69 virtual void ManageDialog(NativeWebContentsModalDialog dialog) OVERRIDE {
70 views::Widget* widget = GetWidget(dialog); 70 views::Widget* widget = GetWidget(dialog);
71 widget->AddObserver(this); 71 widget->AddObserver(this);
72 observed_widgets_.insert(widget); 72 observed_widgets_.insert(widget);
73 widget->set_movement_disabled(true); 73 widget->set_movement_disabled(true);
74 74
75 #if defined(USE_AURA) 75 #if defined(USE_AURA)
76 // TODO(wittman): remove once the new visual style is complete 76 // TODO(wittman): remove once the new visual style is complete
77 widget->GetNativeWindow()->SetProperty(aura::client::kConstrainedWindowKey, 77 widget->GetNativeWindow()->SetProperty(aura::client::kConstrainedWindowKey,
78 true); 78 true);
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 view->parent()->ClearProperty(aura::client::kAnimationsDisabledKey); 220 view->parent()->ClearProperty(aura::client::kAnimationsDisabledKey);
221 #endif 221 #endif
222 widget->RemoveObserver(this); 222 widget->RemoveObserver(this);
223 native_delegate_->WillClose(widget->GetNativeView()); 223 native_delegate_->WillClose(widget->GetNativeView());
224 observed_widgets_.erase(widget); 224 observed_widgets_.erase(widget);
225 #if defined(USE_AURA) 225 #if defined(USE_AURA)
226 shown_widgets_.erase(widget); 226 shown_widgets_.erase(widget);
227 #endif 227 #endif
228 } 228 }
229 229
230 NativeWebContentsModalDialogManagerDelegate* native_delegate_; 230 SingleWebContentsDialogManagerDelegate* native_delegate_;
231 WebContentsModalDialogHost* host_; 231 WebContentsModalDialogHost* host_;
232 std::set<views::Widget*> observed_widgets_; 232 std::set<views::Widget*> observed_widgets_;
233 std::set<views::Widget*> shown_widgets_; 233 std::set<views::Widget*> shown_widgets_;
234 234
235 DISALLOW_COPY_AND_ASSIGN(NativeWebContentsModalDialogManagerViews); 235 DISALLOW_COPY_AND_ASSIGN(NativeWebContentsModalDialogManagerViews);
236 }; 236 };
237 237
238 } // namespace 238 } // namespace
239 239
240 namespace web_modal { 240 namespace web_modal {
241 241
242 NativeWebContentsModalDialogManager* WebContentsModalDialogManager:: 242 SingleWebContentsDialogManager* WebContentsModalDialogManager::
243 CreateNativeManager( 243 CreateNativeWebModalManager(
244 NativeWebContentsModalDialogManagerDelegate* native_delegate) { 244 SingleWebContentsDialogManagerDelegate* native_delegate) {
245 return new NativeWebContentsModalDialogManagerViews(native_delegate); 245 return new NativeWebContentsModalDialogManagerViews(native_delegate);
246 } 246 }
247 247
248 } // namespace web_modal 248 } // namespace web_modal
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698