diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 21:54:14 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-08 21:54:14 +0000 |
| commit | bd1b96700fa45143e04bd8d07a0a519d6962f4a6 (patch) | |
| tree | 73ed252babadbeb0e1550581e23d29c7a65f701e /chrome/browser/views/bookmark_editor_view.cc | |
| parent | 7c51b0ee951bf8ed70d0ed6506567991c611d070 (diff) | |
| download | chromium_src-bd1b96700fa45143e04bd8d07a0a519d6962f4a6.zip chromium_src-bd1b96700fa45143e04bd8d07a0a519d6962f4a6.tar.gz chromium_src-bd1b96700fa45143e04bd8d07a0a519d6962f4a6.tar.bz2 | |
Lands http://codereview.chromium.org/155128 for Thiago.
Description from Thiago:
Converting the history::StarredEntry::Type to a type defined in BookmarkNode.
BUG=NONE
TEST=NONE
Review URL: http://codereview.chromium.org/155165
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20195 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/bookmark_editor_view.cc')
| -rw-r--r-- | chrome/browser/views/bookmark_editor_view.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/views/bookmark_editor_view.cc b/chrome/browser/views/bookmark_editor_view.cc index ed51083..5843504 100644 --- a/chrome/browser/views/bookmark_editor_view.cc +++ b/chrome/browser/views/bookmark_editor_view.cc @@ -287,11 +287,13 @@ void BookmarkEditorView::Init() { } // Yummy layout code. + GridLayout* layout = CreatePanelGridLayout(this); + SetLayoutManager(layout); + const int labels_column_set_id = 0; const int single_column_view_set_id = 1; const int buttons_column_set_id = 2; - GridLayout* layout = CreatePanelGridLayout(this); - SetLayoutManager(layout); + ColumnSet* column_set = layout->AddColumnSet(labels_column_set_id); column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0, GridLayout::USE_PREF, 0, 0); @@ -456,9 +458,8 @@ BookmarkEditorView::EditorNode* BookmarkEditorView::CreateRootNode() { const BookmarkNode* bb_root_node = bb_model_->root_node(); CreateNodes(bb_root_node, root_node); DCHECK(root_node->GetChildCount() == 2); - DCHECK(bb_root_node->GetChild(0)->GetType() == - history::StarredEntry::BOOKMARK_BAR); - DCHECK(bb_root_node->GetChild(1)->GetType() == history::StarredEntry::OTHER); + DCHECK(bb_root_node->GetChild(0)->GetType() == BookmarkNode::BOOKMARK_BAR); + DCHECK(bb_root_node->GetChild(1)->GetType() == BookmarkNode::OTHER_NODE); return root_node; } |