diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-30 21:19:07 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-30 21:19:07 +0000 |
| commit | a136016faff78780a4776c03e252e51d2f7cae37 (patch) | |
| tree | ffbc1550c4275cd674f11410e15639f71daa67cf /views/view.cc | |
| parent | 9acc48601ea4aff4e5ec977c0dd089e887ba5ffd (diff) | |
| download | chromium_src-a136016faff78780a4776c03e252e51d2f7cae37.zip chromium_src-a136016faff78780a4776c03e252e51d2f7cae37.tar.gz chromium_src-a136016faff78780a4776c03e252e51d2f7cae37.tar.bz2 | |
Adds link to bookmark bar that when clicked imports bookmarks. I also
added support for baselines to GridLayout.
BUG=4374
TEST=On a new profile make sure the bookmark bar has a link to import
bookmarks, click the link and make sure you can import your bookmarks.
Review URL: http://codereview.chromium.org/440029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33336 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/view.cc')
| -rw-r--r-- | views/view.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/views/view.cc b/views/view.cc index 3450e9a..f4869ec 100644 --- a/views/view.cc +++ b/views/view.cc @@ -143,6 +143,10 @@ gfx::Size View::GetPreferredSize() { return gfx::Size(); } +int View::GetBaseline() { + return -1; +} + void View::SizeToPreferredSize() { gfx::Size prefsize = GetPreferredSize(); if ((prefsize.width() != width()) || (prefsize.height() != height())) |