OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/bookmark_editor_view.h" | 5 #include "chrome/browser/ui/views/bookmark_editor_view.h" |
6 | 6 |
7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
307 IDS_BOOMARK_EDITOR_NEW_FOLDER_BUTTON)))); | 307 IDS_BOOMARK_EDITOR_NEW_FOLDER_BUTTON)))); |
308 new_group_button_->set_parent_owned(false); | 308 new_group_button_->set_parent_owned(false); |
309 tree_view_->SetContextMenuController(this); | 309 tree_view_->SetContextMenuController(this); |
310 | 310 |
311 tree_view_->SetRootShown(false); | 311 tree_view_->SetRootShown(false); |
312 new_group_button_->SetEnabled(false); | 312 new_group_button_->SetEnabled(false); |
313 new_group_button_->SetID(kNewGroupButtonID); | 313 new_group_button_->SetID(kNewGroupButtonID); |
314 } | 314 } |
315 | 315 |
316 // Yummy layout code. | 316 // Yummy layout code. |
317 GridLayout* layout = CreatePanelGridLayout(this); | 317 GridLayout* layout = GridLayout::CreatePanel(this); |
318 SetLayoutManager(layout); | 318 SetLayoutManager(layout); |
319 | 319 |
320 const int labels_column_set_id = 0; | 320 const int labels_column_set_id = 0; |
321 const int single_column_view_set_id = 1; | 321 const int single_column_view_set_id = 1; |
322 const int buttons_column_set_id = 2; | 322 const int buttons_column_set_id = 2; |
323 | 323 |
324 ColumnSet* column_set = layout->AddColumnSet(labels_column_set_id); | 324 ColumnSet* column_set = layout->AddColumnSet(labels_column_set_id); |
325 column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0, | 325 column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0, |
326 GridLayout::USE_PREF, 0, 0); | 326 GridLayout::USE_PREF, 0, 0); |
327 column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); | 327 column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); |
(...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
579 break; | 579 break; |
580 } | 580 } |
581 } | 581 } |
582 DCHECK(child_bb_node); | 582 DCHECK(child_bb_node); |
583 bb_model_->SetTitle(child_bb_node, child_b_node->GetTitle()); | 583 bb_model_->SetTitle(child_bb_node, child_b_node->GetTitle()); |
584 } | 584 } |
585 ApplyNameChangesAndCreateNewGroups(child_bb_node, child_b_node, | 585 ApplyNameChangesAndCreateNewGroups(child_bb_node, child_b_node, |
586 parent_b_node, parent_bb_node); | 586 parent_b_node, parent_bb_node); |
587 } | 587 } |
588 } | 588 } |
OLD | NEW |