diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-04 23:02:14 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-04 23:02:14 +0000 |
| commit | 57706ce2f74622c9168de86fd4d23451cb30f67f (patch) | |
| tree | b89a411cb447c0065a44b4c8b2f2756ddeca86dc /views | |
| parent | d8b65915b2181a863611254c3cefb966103386f3 (diff) | |
| download | chromium_src-57706ce2f74622c9168de86fd4d23451cb30f67f.zip chromium_src-57706ce2f74622c9168de86fd4d23451cb30f67f.tar.gz chromium_src-57706ce2f74622c9168de86fd4d23451cb30f67f.tar.bz2 | |
Lands http://codereview.chromium.org/466002 for Thiago:
Switch a CSize variable (WTL) to use the gfx::Size type.
BUG=2186
TEST=compiles
Review URL: http://codereview.chromium.org/466039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33877 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/window/window_win.cc | 8 | ||||
| -rw-r--r-- | views/window/window_win.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/views/window/window_win.cc b/views/window/window_win.cc index 6689a5b..e1a10af 100644 --- a/views/window/window_win.cc +++ b/views/window/window_win.cc @@ -1283,17 +1283,17 @@ void WindowWin::SetInitialBounds(const gfx::Rect& create_bounds) { gfx::Rect saved_bounds(create_bounds.ToRECT()); if (window_delegate_->GetSavedWindowBounds(&saved_bounds)) { // Make sure the bounds are at least the minimum size. - if (saved_bounds.width() < minimum_size_.cx) { + if (saved_bounds.width() < minimum_size_.width()) { saved_bounds.SetRect(saved_bounds.x(), saved_bounds.y(), - saved_bounds.right() + minimum_size_.cx - + saved_bounds.right() + minimum_size_.width() - saved_bounds.width(), saved_bounds.bottom()); } - if (saved_bounds.height() < minimum_size_.cy) { + if (saved_bounds.height() < minimum_size_.height()) { saved_bounds.SetRect(saved_bounds.x(), saved_bounds.y(), saved_bounds.right(), - saved_bounds.bottom() + minimum_size_.cy - + saved_bounds.bottom() + minimum_size_.height() - saved_bounds.height()); } diff --git a/views/window/window_win.h b/views/window/window_win.h index e9625c2..12e3d2e 100644 --- a/views/window/window_win.h +++ b/views/window/window_win.h @@ -238,7 +238,7 @@ class WindowWin : public WidgetWin, HWND owning_hwnd_; // The smallest size the window can be. - CSize minimum_size_; + gfx::Size minimum_size_; // Whether or not the window is modal. This comes from the delegate and is // cached at Init time to avoid calling back to the delegate from the |