OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "components/constrained_window/constrained_window_views.h" | 5 #include "components/constrained_window/constrained_window_views.h" |
6 | 6 |
7 #include "components/web_modal/test_web_contents_modal_dialog_host.h" | 7 #include "components/web_modal/test_web_contents_modal_dialog_host.h" |
8 #include "ui/gfx/native_widget_types.h" | 8 #include "ui/gfx/native_widget_types.h" |
9 #include "ui/gfx/point.h" | 9 #include "ui/gfx/point.h" |
10 #include "ui/gfx/rect.h" | 10 #include "ui/gfx/rect.h" |
11 #include "ui/gfx/size.h" | 11 #include "ui/gfx/size.h" |
12 #include "ui/views/border.h" | 12 #include "ui/views/border.h" |
13 #include "ui/views/test/views_test_base.h" | 13 #include "ui/views/test/views_test_base.h" |
14 #include "ui/views/widget/widget.h" | 14 #include "ui/views/widget/widget.h" |
15 #include "ui/views/window/dialog_delegate.h" | 15 #include "ui/views/window/dialog_delegate.h" |
16 | 16 |
17 namespace views { | 17 namespace views { |
18 | 18 |
19 class DialogContents : public DialogDelegateView { | 19 class DialogContents : public DialogDelegateView { |
20 public: | 20 public: |
21 DialogContents() {} | 21 DialogContents() {} |
22 virtual ~DialogContents() {} | 22 ~DialogContents() override {} |
23 | 23 |
24 void set_preferred_size(const gfx::Size& preferred_size) { | 24 void set_preferred_size(const gfx::Size& preferred_size) { |
25 preferred_size_ = preferred_size; | 25 preferred_size_ = preferred_size; |
26 } | 26 } |
27 | 27 |
28 // Overriden from DialogDelegateView: | 28 // Overriden from DialogDelegateView: |
29 virtual View* GetContentsView() override { return this; } | 29 View* GetContentsView() override { return this; } |
30 virtual gfx::Size GetPreferredSize() const override { | 30 gfx::Size GetPreferredSize() const override { return preferred_size_; } |
31 return preferred_size_; | 31 gfx::Size GetMinimumSize() const override { return gfx::Size(); } |
32 } | |
33 virtual gfx::Size GetMinimumSize() const override { return gfx::Size(); } | |
34 | 32 |
35 private: | 33 private: |
36 gfx::Size preferred_size_; | 34 gfx::Size preferred_size_; |
37 | 35 |
38 DISALLOW_COPY_AND_ASSIGN(DialogContents); | 36 DISALLOW_COPY_AND_ASSIGN(DialogContents); |
39 }; | 37 }; |
40 | 38 |
41 class ConstrainedWindowViewsTest : public ViewsTestBase { | 39 class ConstrainedWindowViewsTest : public ViewsTestBase { |
42 public: | 40 public: |
43 ConstrainedWindowViewsTest() : contents_(NULL) {} | 41 ConstrainedWindowViewsTest() : contents_(NULL) {} |
44 virtual ~ConstrainedWindowViewsTest() {} | 42 ~ConstrainedWindowViewsTest() override {} |
45 | 43 |
46 virtual void SetUp() override { | 44 void SetUp() override { |
47 ViewsTestBase::SetUp(); | 45 ViewsTestBase::SetUp(); |
48 contents_ = new DialogContents; | 46 contents_ = new DialogContents; |
49 Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW); | 47 Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW); |
50 params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; | 48 params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; |
51 params.delegate = contents_; | 49 params.delegate = contents_; |
52 dialog_.reset(new Widget); | 50 dialog_.reset(new Widget); |
53 dialog_->Init(params); | 51 dialog_->Init(params); |
54 dialog_host_.reset(new web_modal::TestWebContentsModalDialogHost( | 52 dialog_host_.reset(new web_modal::TestWebContentsModalDialogHost( |
55 dialog_->GetNativeView())); | 53 dialog_->GetNativeView())); |
56 dialog_host_->set_max_dialog_size(gfx::Size(5000, 5000)); | 54 dialog_host_->set_max_dialog_size(gfx::Size(5000, 5000)); |
57 | 55 |
58 // Make sure the dialog size is dominated by the preferred size of the | 56 // Make sure the dialog size is dominated by the preferred size of the |
59 // contents. | 57 // contents. |
60 gfx::Size preferred_size = dialog()->GetRootView()->GetPreferredSize(); | 58 gfx::Size preferred_size = dialog()->GetRootView()->GetPreferredSize(); |
61 preferred_size.Enlarge(500, 500); | 59 preferred_size.Enlarge(500, 500); |
62 contents()->set_preferred_size(preferred_size); | 60 contents()->set_preferred_size(preferred_size); |
63 } | 61 } |
64 | 62 |
65 virtual void TearDown() override { | 63 void TearDown() override { |
66 ViewsTestBase::TearDown(); | 64 ViewsTestBase::TearDown(); |
67 contents_ = NULL; | 65 contents_ = NULL; |
68 dialog_host_.reset(); | 66 dialog_host_.reset(); |
69 dialog_.reset(); | 67 dialog_.reset(); |
70 } | 68 } |
71 | 69 |
72 gfx::Size GetDialogSize() { | 70 gfx::Size GetDialogSize() { |
73 return dialog()->GetRootView()->GetBoundsInScreen().size(); | 71 return dialog()->GetRootView()->GetBoundsInScreen().size(); |
74 } | 72 } |
75 | 73 |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
145 | 143 |
146 // Increasing the maximum dialog size should bring the dialog back to its | 144 // Increasing the maximum dialog size should bring the dialog back to its |
147 // original size. | 145 // original size. |
148 max_dialog_size.Enlarge(100, 100); | 146 max_dialog_size.Enlarge(100, 100); |
149 dialog_host()->set_max_dialog_size(max_dialog_size); | 147 dialog_host()->set_max_dialog_size(max_dialog_size); |
150 UpdateWebContentsModalDialogPosition(dialog(), dialog_host()); | 148 UpdateWebContentsModalDialogPosition(dialog(), dialog_host()); |
151 EXPECT_EQ(full_dialog_size.ToString(), GetDialogSize().ToString()); | 149 EXPECT_EQ(full_dialog_size.ToString(), GetDialogSize().ToString()); |
152 } | 150 } |
153 | 151 |
154 } // namespace views | 152 } // namespace views |
OLD | NEW |