| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "app/gfx/canvas.h" | 9 #include "app/gfx/canvas.h" |
| 10 #include "app/gfx/color_utils.h" | 10 #include "app/gfx/color_utils.h" |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 tools_menu_button->SetID(kToolsMenuButtonID); | 170 tools_menu_button->SetID(kToolsMenuButtonID); |
| 171 | 171 |
| 172 split_view_ = new views::SingleSplitView(tree_view_, table_view_); | 172 split_view_ = new views::SingleSplitView(tree_view_, table_view_); |
| 173 split_view_->set_background( | 173 split_view_->set_background( |
| 174 views::Background::CreateSolidBackground(kBackgroundColorBottom)); | 174 views::Background::CreateSolidBackground(kBackgroundColorBottom)); |
| 175 | 175 |
| 176 views::GridLayout* layout = new views::GridLayout(this); | 176 views::GridLayout* layout = new views::GridLayout(this); |
| 177 SetLayoutManager(layout); | 177 SetLayoutManager(layout); |
| 178 const int top_id = 1; | 178 const int top_id = 1; |
| 179 const int split_cs_id = 2; | 179 const int split_cs_id = 2; |
| 180 layout->SetInsets(2, 0, 0, 0); // 2px padding above content. | 180 layout->SetInsets(2, 0, 0, 0); // 2px padding above content. |
| 181 views::ColumnSet* column_set = layout->AddColumnSet(top_id); | 181 views::ColumnSet* column_set = layout->AddColumnSet(top_id); |
| 182 column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, | 182 column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, |
| 183 0, views::GridLayout::USE_PREF, 0, 0); | 183 0, views::GridLayout::USE_PREF, 0, 0); |
| 184 column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, | 184 column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, |
| 185 0, views::GridLayout::USE_PREF, 0, 0); | 185 0, views::GridLayout::USE_PREF, 0, 0); |
| 186 column_set->AddPaddingColumn(1, kUnrelatedControlHorizontalSpacing); | 186 column_set->AddPaddingColumn(1, kUnrelatedControlHorizontalSpacing); |
| 187 column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, | 187 column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, |
| 188 0, views::GridLayout::USE_PREF, 0, 0); | 188 0, views::GridLayout::USE_PREF, 0, 0); |
| 189 column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); | 189 column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); |
| 190 column_set->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER, | 190 column_set->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER, |
| 191 0, views::GridLayout::USE_PREF, 0, 0); | 191 0, views::GridLayout::USE_PREF, 0, 0); |
| 192 column_set->AddPaddingColumn(0, 3); // 3px padding at end of row. | 192 column_set->AddPaddingColumn(0, 3); // 3px padding at end of row. |
| 193 | 193 |
| 194 column_set = layout->AddColumnSet(split_cs_id); | 194 column_set = layout->AddColumnSet(split_cs_id); |
| 195 column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1, | 195 column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1, |
| 196 views::GridLayout::USE_PREF, 0, 0); | 196 views::GridLayout::USE_PREF, 0, 0); |
| 197 | 197 |
| 198 layout->StartRow(0, top_id); | 198 layout->StartRow(0, top_id); |
| 199 layout->AddView(organize_menu_button); | 199 layout->AddView(organize_menu_button); |
| 200 layout->AddView(tools_menu_button); | 200 layout->AddView(tools_menu_button); |
| 201 layout->AddView(new views::Label( | 201 layout->AddView(new views::Label( |
| 202 l10n_util::GetString(IDS_BOOKMARK_MANAGER_SEARCH_TITLE))); | 202 l10n_util::GetString(IDS_BOOKMARK_MANAGER_SEARCH_TITLE))); |
| 203 layout->AddView(search_tf_); | 203 layout->AddView(search_tf_); |
| 204 | 204 |
| 205 layout->AddPaddingRow(0, 3); // 3px padding between rows. | 205 layout->AddPaddingRow(0, 3); // 3px padding between rows. |
| 206 | 206 |
| 207 layout->StartRow(1, split_cs_id); | 207 layout->StartRow(1, split_cs_id); |
| 208 layout->AddView(split_view_); | 208 layout->AddView(split_view_); |
| 209 | 209 |
| 210 // Press Ctrl-W to close bookmark manager window. | 210 // Press Ctrl-W to close bookmark manager window. |
| 211 AddAccelerator(views::Accelerator('W', false, true, false)); | 211 AddAccelerator(views::Accelerator('W', false, true, false)); |
| 212 | 212 |
| 213 BookmarkModel* bookmark_model = profile_->GetBookmarkModel(); | 213 BookmarkModel* bookmark_model = profile_->GetBookmarkModel(); |
| 214 if (!bookmark_model->IsLoaded()) | 214 if (!bookmark_model->IsLoaded()) |
| 215 bookmark_model->AddObserver(this); | 215 bookmark_model->AddObserver(this); |
| (...skipping 360 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 576 } | 576 } |
| 577 | 577 |
| 578 void BookmarkManagerView::FileSelectionCanceled(void* params) { | 578 void BookmarkManagerView::FileSelectionCanceled(void* params) { |
| 579 select_file_dialog_ = NULL; | 579 select_file_dialog_ = NULL; |
| 580 } | 580 } |
| 581 | 581 |
| 582 BookmarkTableModel* BookmarkManagerView::CreateSearchTableModel() { | 582 BookmarkTableModel* BookmarkManagerView::CreateSearchTableModel() { |
| 583 std::wstring search_text = search_tf_->text(); | 583 std::wstring search_text = search_tf_->text(); |
| 584 if (search_text.empty()) | 584 if (search_text.empty()) |
| 585 return NULL; | 585 return NULL; |
| 586 return BookmarkTableModel::CreateSearchTableModel(GetBookmarkModel(), | 586 std::wstring languages = |
| 587 search_text); | 587 profile_->GetPrefs()->GetString(prefs::kAcceptLanguages); |
| 588 return BookmarkTableModel::CreateSearchTableModel( |
| 589 GetBookmarkModel(), search_text, languages); |
| 588 } | 590 } |
| 589 | 591 |
| 590 void BookmarkManagerView::SetTableModel(BookmarkTableModel* new_table_model, | 592 void BookmarkManagerView::SetTableModel(BookmarkTableModel* new_table_model, |
| 591 BookmarkNode* parent_node, | 593 BookmarkNode* parent_node, |
| 592 bool is_search) { | 594 bool is_search) { |
| 593 // Be sure and reset the model on the view before updating table_model_. | 595 // Be sure and reset the model on the view before updating table_model_. |
| 594 // Otherwise the view will attempt to use the deleted model when we set the | 596 // Otherwise the view will attempt to use the deleted model when we set the |
| 595 // new one. | 597 // new one. |
| 596 table_view_->SetModel(NULL); | 598 table_view_->SetModel(NULL); |
| 597 table_view_->SetShowPathColumn(!parent_node); | 599 table_view_->SetShowPathColumn(!parent_node); |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 769 file_type_info.extensions.resize(1); | 771 file_type_info.extensions.resize(1); |
| 770 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("html")); | 772 file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("html")); |
| 771 file_type_info.include_all_files = true; | 773 file_type_info.include_all_files = true; |
| 772 select_file_dialog_ = SelectFileDialog::Create(this); | 774 select_file_dialog_ = SelectFileDialog::Create(this); |
| 773 select_file_dialog_->SelectFile( | 775 select_file_dialog_->SelectFile( |
| 774 SelectFileDialog::SELECT_SAVEAS_FILE, std::wstring(), | 776 SelectFileDialog::SELECT_SAVEAS_FILE, std::wstring(), |
| 775 FilePath(FILE_PATH_LITERAL("bookmarks.html")), &file_type_info, 0, | 777 FilePath(FILE_PATH_LITERAL("bookmarks.html")), &file_type_info, 0, |
| 776 L"html", GetWidget()->GetNativeView(), | 778 L"html", GetWidget()->GetNativeView(), |
| 777 reinterpret_cast<void*>(IDS_BOOKMARK_MANAGER_EXPORT_MENU)); | 779 reinterpret_cast<void*>(IDS_BOOKMARK_MANAGER_EXPORT_MENU)); |
| 778 } | 780 } |
| OLD | NEW |