diff options
| author | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-29 22:02:49 +0000 |
|---|---|---|
| committer | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-29 22:02:49 +0000 |
| commit | 45be9f0f5fb9faa4c69034ff61be7a58e465a151 (patch) | |
| tree | 42ab44877b1384822c3178cdb6fa252244a1eca9 /ui/views/layout/grid_layout.cc | |
| parent | 6760cf3b18c9faf534fecfe4b0842abfde83b2ed (diff) | |
| download | chromium_src-45be9f0f5fb9faa4c69034ff61be7a58e465a151.zip chromium_src-45be9f0f5fb9faa4c69034ff61be7a58e465a151.tar.gz chromium_src-45be9f0f5fb9faa4c69034ff61be7a58e465a151.tar.bz2 | |
[Web Intents] Views implementation of inline extension install.
BUG=113476, 113482
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9718010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129702 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/layout/grid_layout.cc')
| -rw-r--r-- | ui/views/layout/grid_layout.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/views/layout/grid_layout.cc b/ui/views/layout/grid_layout.cc index 8fb1005..b11bcbf 100644 --- a/ui/views/layout/grid_layout.cc +++ b/ui/views/layout/grid_layout.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -834,6 +834,8 @@ gfx::Size GridLayout::GetPreferredSize(View* host) { DCHECK(host_ == host); gfx::Size out; SizeRowsAndColumns(false, 0, 0, &out); + out.SetSize(std::max(out.width(), minimum_size_.width()), + std::max(out.height(), minimum_size_.height())); return out; } |