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/grid_layout.h | |
| 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/grid_layout.h')
| -rw-r--r-- | views/grid_layout.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/views/grid_layout.h b/views/grid_layout.h index e3e7a62..9f07242 100644 --- a/views/grid_layout.h +++ b/views/grid_layout.h @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2009 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. @@ -81,7 +81,11 @@ class GridLayout : public LayoutManager { TRAILING, // The view is resized to fill the space. - FILL + FILL, + + // The view is aligned along the baseline. This is only valid for the + // vertical axis. + BASELINE }; // An enumeration of the possible ways the size of a column may be obtained. @@ -244,7 +248,7 @@ class GridLayout : public LayoutManager { // Rows. std::vector<Row*> rows_; - DISALLOW_EVIL_CONSTRUCTORS(GridLayout); + DISALLOW_COPY_AND_ASSIGN(GridLayout); }; // ColumnSet is used to define a set of columns. GridLayout may have any @@ -346,7 +350,7 @@ class ColumnSet { // for a description of what the master column is. std::vector<Column*> master_columns_; - DISALLOW_EVIL_CONSTRUCTORS(ColumnSet); + DISALLOW_COPY_AND_ASSIGN(ColumnSet); }; } // namespace views |