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

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

Issue 273223002: views: Make view::Views::GetPreferredSize() const. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More compile fix for ToT Created 6 years, 7 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 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 "chrome/browser/ui/views/constrained_window_views.h" 5 #include "chrome/browser/ui/views/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 virtual ~DialogContents() {}
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 virtual View* GetContentsView() OVERRIDE { return this; }
30 virtual gfx::Size GetPreferredSize() OVERRIDE { return preferred_size_; } 30 virtual gfx::Size GetPreferredSize() const OVERRIDE {
31 virtual gfx::Size GetMinimumSize() OVERRIDE { return gfx::Size(); } 31 return preferred_size_;
32 }
33 virtual gfx::Size GetMinimumSize() const OVERRIDE { return gfx::Size(); }
32 34
33 private: 35 private:
34 gfx::Size preferred_size_; 36 gfx::Size preferred_size_;
35 37
36 DISALLOW_COPY_AND_ASSIGN(DialogContents); 38 DISALLOW_COPY_AND_ASSIGN(DialogContents);
37 }; 39 };
38 40
39 class ConstrainedWindowViewsTest : public ViewsTestBase { 41 class ConstrainedWindowViewsTest : public ViewsTestBase {
40 public: 42 public:
41 ConstrainedWindowViewsTest() : contents_(NULL) {} 43 ConstrainedWindowViewsTest() : contents_(NULL) {}
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 145
144 // Increasing the maximum dialog size should bring the dialog back to its 146 // Increasing the maximum dialog size should bring the dialog back to its
145 // original size. 147 // original size.
146 max_dialog_size.Enlarge(100, 100); 148 max_dialog_size.Enlarge(100, 100);
147 dialog_host()->set_max_dialog_size(max_dialog_size); 149 dialog_host()->set_max_dialog_size(max_dialog_size);
148 UpdateWebContentsModalDialogPosition(dialog(), dialog_host()); 150 UpdateWebContentsModalDialogPosition(dialog(), dialog_host());
149 EXPECT_EQ(full_dialog_size.ToString(), GetDialogSize().ToString()); 151 EXPECT_EQ(full_dialog_size.ToString(), GetDialogSize().ToString());
150 } 152 }
151 153
152 } // namespace views 154 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698