diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-07 03:25:48 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-07 03:25:48 +0000 |
| commit | dbb66e6bf4914172a96f5121b1ffcad73fb0826d (patch) | |
| tree | d8ad643a76f008edd687b2a6fc73fbc0293f2227 /chrome | |
| parent | b5630e5b4504b033d8262eb902ddc867477d1cdf (diff) | |
| download | chromium_src-dbb66e6bf4914172a96f5121b1ffcad73fb0826d.zip chromium_src-dbb66e6bf4914172a96f5121b1ffcad73fb0826d.tar.gz chromium_src-dbb66e6bf4914172a96f5121b1ffcad73fb0826d.tar.bz2 | |
Views based implementation of treeview. There are a couple of things
left to resolve: editing, context menus and auto_expand_children.
BUG=109141
TEST=none
R=ben@chromium.org
Review URL: http://codereview.chromium.org/9120014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116807 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/ui/views/collected_cookies_win.cc | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc index aaa62a4..7c9d08e 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc @@ -400,7 +400,7 @@ void BookmarkEditorView::Init() { if (show_tree_) { layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing); layout->StartRow(1, single_column_view_set_id); - layout->AddView(tree_view_); + layout->AddView(tree_view_->CreateParentIfNecessary()); } layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing); diff --git a/chrome/browser/ui/views/collected_cookies_win.cc b/chrome/browser/ui/views/collected_cookies_win.cc index dae83c2..bf960ef 100644 --- a/chrome/browser/ui/views/collected_cookies_win.cc +++ b/chrome/browser/ui/views/collected_cookies_win.cc @@ -276,8 +276,9 @@ views::View* CollectedCookiesWin::CreateAllowedPane() { layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing); layout->StartRow(1, single_column_layout_id); - layout->AddView(allowed_cookies_tree_, 1, 1, GridLayout::FILL, - GridLayout::FILL, kTreeViewWidth, kTreeViewHeight); + layout->AddView(allowed_cookies_tree_->CreateParentIfNecessary(), 1, 1, + GridLayout::FILL, GridLayout::FILL, kTreeViewWidth, + kTreeViewHeight); layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing); layout->StartRow(0, single_column_layout_id); @@ -342,8 +343,8 @@ views::View* CollectedCookiesWin::CreateBlockedPane() { layout->StartRow(1, single_column_layout_id); layout->AddView( - blocked_cookies_tree_, 1, 1, GridLayout::FILL, GridLayout::FILL, - kTreeViewWidth, kTreeViewHeight); + blocked_cookies_tree_->CreateParentIfNecessary(), 1, 1, + GridLayout::FILL, GridLayout::FILL, kTreeViewWidth, kTreeViewHeight); layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing); layout->StartRow(0, three_columns_layout_id); |