| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/views/bookmark_manager_view.h" | 5 #include "chrome/browser/views/bookmark_manager_view.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/gfx/skia_utils.h" | 9 #include "base/gfx/skia_utils.h" |
| 10 #include "chrome/app/locales/locale_settings.h" | 10 #include "chrome/app/locales/locale_settings.h" |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 l10n_util::GetString(IDS_BOOKMARK_MANAGER_TOOLS_MENU), | 151 l10n_util::GetString(IDS_BOOKMARK_MANAGER_TOOLS_MENU), |
| 152 this, true); | 152 this, true); |
| 153 tools_menu_button->SetID(kToolsMenuButtonID); | 153 tools_menu_button->SetID(kToolsMenuButtonID); |
| 154 | 154 |
| 155 split_view_ = new views::SingleSplitView(tree_view_, table_view_); | 155 split_view_ = new views::SingleSplitView(tree_view_, table_view_); |
| 156 | 156 |
| 157 views::GridLayout* layout = new views::GridLayout(this); | 157 views::GridLayout* layout = new views::GridLayout(this); |
| 158 SetLayoutManager(layout); | 158 SetLayoutManager(layout); |
| 159 const int top_id = 1; | 159 const int top_id = 1; |
| 160 const int split_cs_id = 2; | 160 const int split_cs_id = 2; |
| 161 layout->SetInsets(2, 0, 0, 0); | 161 layout->SetInsets(2, 0, 0, 0); // 2px padding above content. |
| 162 views::ColumnSet* column_set = layout->AddColumnSet(top_id); | 162 views::ColumnSet* column_set = layout->AddColumnSet(top_id); |
| 163 column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, | 163 column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, |
| 164 0, views::GridLayout::USE_PREF, 0, 0); | 164 0, views::GridLayout::USE_PREF, 0, 0); |
| 165 column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); | |
| 166 column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, | 165 column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, |
| 167 0, views::GridLayout::USE_PREF, 0, 0); | 166 0, views::GridLayout::USE_PREF, 0, 0); |
| 168 column_set->AddPaddingColumn(1, kUnrelatedControlHorizontalSpacing); | 167 column_set->AddPaddingColumn(1, kUnrelatedControlHorizontalSpacing); |
| 169 column_set->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER, | 168 column_set->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER, |
| 170 1, views::GridLayout::USE_PREF, 0, 0); | 169 1, views::GridLayout::USE_PREF, 0, 0); |
| 171 column_set->AddPaddingColumn(0, kButtonHEdgeMargin); | 170 column_set->AddPaddingColumn(0, 3); // 3px padding at end of row. |
| 172 | 171 |
| 173 column_set = layout->AddColumnSet(split_cs_id); | 172 column_set = layout->AddColumnSet(split_cs_id); |
| 174 column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1, | 173 column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1, |
| 175 views::GridLayout::USE_PREF, 0, 0); | 174 views::GridLayout::USE_PREF, 0, 0); |
| 176 | 175 |
| 177 layout->StartRow(0, top_id); | 176 layout->StartRow(0, top_id); |
| 178 layout->AddView(organize_menu_button); | 177 layout->AddView(organize_menu_button); |
| 179 layout->AddView(tools_menu_button); | 178 layout->AddView(tools_menu_button); |
| 180 layout->AddView(search_tf_); | 179 layout->AddView(search_tf_); |
| 181 | 180 |
| 182 layout->AddPaddingRow(0, kRelatedControlVerticalSpacing); | 181 layout->AddPaddingRow(0, 3); // 3px padding between rows. |
| 183 | 182 |
| 184 layout->StartRow(1, split_cs_id); | 183 layout->StartRow(1, split_cs_id); |
| 185 layout->AddView(split_view_); | 184 layout->AddView(split_view_); |
| 186 | 185 |
| 187 BookmarkModel* bookmark_model = profile_->GetBookmarkModel(); | 186 BookmarkModel* bookmark_model = profile_->GetBookmarkModel(); |
| 188 if (!bookmark_model->IsLoaded()) | 187 if (!bookmark_model->IsLoaded()) |
| 189 bookmark_model->AddObserver(this); | 188 bookmark_model->AddObserver(this); |
| 190 } | 189 } |
| 191 | 190 |
| 192 BookmarkManagerView::~BookmarkManagerView() { | 191 BookmarkManagerView::~BookmarkManagerView() { |
| (...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 710 void BookmarkManagerView::ShowExportBookmarksFileChooser() { | 709 void BookmarkManagerView::ShowExportBookmarksFileChooser() { |
| 711 if (select_file_dialog_.get()) | 710 if (select_file_dialog_.get()) |
| 712 select_file_dialog_->ListenerDestroyed(); | 711 select_file_dialog_->ListenerDestroyed(); |
| 713 | 712 |
| 714 select_file_dialog_ = SelectFileDialog::Create(this); | 713 select_file_dialog_ = SelectFileDialog::Create(this); |
| 715 select_file_dialog_->SelectFile( | 714 select_file_dialog_->SelectFile( |
| 716 SelectFileDialog::SELECT_SAVEAS_FILE, std::wstring(), std::wstring(), | 715 SelectFileDialog::SELECT_SAVEAS_FILE, std::wstring(), std::wstring(), |
| 717 std::wstring(), GetContainer()->GetHWND(), | 716 std::wstring(), GetContainer()->GetHWND(), |
| 718 reinterpret_cast<void*>(IDS_BOOKMARK_MANAGER_EXPORT_MENU)); | 717 reinterpret_cast<void*>(IDS_BOOKMARK_MANAGER_EXPORT_MENU)); |
| 719 } | 718 } |
| OLD | NEW |