| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/views/bookmarks/bookmark_editor_view.h" | 5 #include "chrome/browser/ui/views/bookmarks/bookmark_editor_view.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 const int buttons_column_set_id = 2; | 294 const int buttons_column_set_id = 2; |
| 295 | 295 |
| 296 views::ColumnSet* column_set = layout->AddColumnSet(labels_column_set_id); | 296 views::ColumnSet* column_set = layout->AddColumnSet(labels_column_set_id); |
| 297 column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0, | 297 column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0, |
| 298 GridLayout::USE_PREF, 0, 0); | 298 GridLayout::USE_PREF, 0, 0); |
| 299 column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing); | 299 column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing); |
| 300 column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1, | 300 column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1, |
| 301 GridLayout::USE_PREF, 0, 0); | 301 GridLayout::USE_PREF, 0, 0); |
| 302 | 302 |
| 303 column_set = layout->AddColumnSet(single_column_view_set_id); | 303 column_set = layout->AddColumnSet(single_column_view_set_id); |
| 304 if (views::DialogDelegate::UseNewStyle()) { | 304 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, |
| 305 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, | 305 GridLayout::USE_PREF, 0, 0); |
| 306 GridLayout::USE_PREF, 0, 0); | |
| 307 } else { | |
| 308 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1, | |
| 309 GridLayout::FIXED, 300, 0); | |
| 310 } | |
| 311 | 306 |
| 312 column_set = layout->AddColumnSet(buttons_column_set_id); | 307 column_set = layout->AddColumnSet(buttons_column_set_id); |
| 313 column_set->AddColumn(GridLayout::FILL, GridLayout::LEADING, 0, | 308 column_set->AddColumn(GridLayout::FILL, GridLayout::LEADING, 0, |
| 314 GridLayout::USE_PREF, 0, 0); | 309 GridLayout::USE_PREF, 0, 0); |
| 315 column_set->AddPaddingColumn(1, views::kRelatedControlHorizontalSpacing); | 310 column_set->AddPaddingColumn(1, views::kRelatedControlHorizontalSpacing); |
| 316 column_set->AddColumn(GridLayout::FILL, GridLayout::LEADING, 0, | 311 column_set->AddColumn(GridLayout::FILL, GridLayout::LEADING, 0, |
| 317 GridLayout::USE_PREF, 0, 0); | 312 GridLayout::USE_PREF, 0, 0); |
| 318 column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing); | 313 column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing); |
| 319 column_set->AddColumn(GridLayout::FILL, GridLayout::LEADING, 0, | 314 column_set->AddColumn(GridLayout::FILL, GridLayout::LEADING, 0, |
| 320 GridLayout::USE_PREF, 0, 0); | 315 GridLayout::USE_PREF, 0, 0); |
| (...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 619 IDS_BOOKMARK_EDITOR_NEW_FOLDER_MENU_ITEM); | 614 IDS_BOOKMARK_EDITOR_NEW_FOLDER_MENU_ITEM); |
| 620 } | 615 } |
| 621 return context_menu_model_.get(); | 616 return context_menu_model_.get(); |
| 622 } | 617 } |
| 623 | 618 |
| 624 void BookmarkEditorView::EditorTreeModel::SetTitle(ui::TreeModelNode* node, | 619 void BookmarkEditorView::EditorTreeModel::SetTitle(ui::TreeModelNode* node, |
| 625 const string16& title) { | 620 const string16& title) { |
| 626 if (!title.empty()) | 621 if (!title.empty()) |
| 627 ui::TreeNodeModel<EditorNode>::SetTitle(node, title); | 622 ui::TreeNodeModel<EditorNode>::SetTitle(node, title); |
| 628 } | 623 } |
| OLD | NEW |