diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-02 22:12:06 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-02 22:12:06 +0000 |
| commit | fa5dfaff1d203ab3fb692b6cd2bf0bdb67b1059c (patch) | |
| tree | 0e5df732f7adb333862e5d44ef549dbb039498e6 /chrome/browser/views/bookmark_manager_view.cc | |
| parent | 8d3b9474b8b002be9e0568aaa7aca64545de960a (diff) | |
| download | chromium_src-fa5dfaff1d203ab3fb692b6cd2bf0bdb67b1059c.zip chromium_src-fa5dfaff1d203ab3fb692b6cd2bf0bdb67b1059c.tar.gz chromium_src-fa5dfaff1d203ab3fb692b6cd2bf0bdb67b1059c.tar.bz2 | |
Support for searching bookmarks for IDN.
The main part of this change is DoesBookmarkContainWords() in
bookmark_utils.cc. It tries to match a query words to IDN and
%-decoded strings as well as ASCII URL.
BUG=3991
TEST=add a unit test, check for IDN in the search box of Bookmark
Manager.
Checked in for tkent@google.com.
Original review: http://codereview.chromium.org/113815
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17435 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/bookmark_manager_view.cc')
| -rw-r--r-- | chrome/browser/views/bookmark_manager_view.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc index 2852b33..a6f0819 100644 --- a/chrome/browser/views/bookmark_manager_view.cc +++ b/chrome/browser/views/bookmark_manager_view.cc @@ -177,7 +177,7 @@ BookmarkManagerView::BookmarkManagerView(Profile* profile) SetLayoutManager(layout); const int top_id = 1; const int split_cs_id = 2; - layout->SetInsets(2, 0, 0, 0); // 2px padding above content. + layout->SetInsets(2, 0, 0, 0); // 2px padding above content. views::ColumnSet* column_set = layout->AddColumnSet(top_id); column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::CENTER, 0, views::GridLayout::USE_PREF, 0, 0); @@ -189,7 +189,7 @@ BookmarkManagerView::BookmarkManagerView(Profile* profile) column_set->AddPaddingColumn(0, kRelatedControlHorizontalSpacing); column_set->AddColumn(views::GridLayout::TRAILING, views::GridLayout::CENTER, 0, views::GridLayout::USE_PREF, 0, 0); - column_set->AddPaddingColumn(0, 3); // 3px padding at end of row. + column_set->AddPaddingColumn(0, 3); // 3px padding at end of row. column_set = layout->AddColumnSet(split_cs_id); column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1, @@ -202,7 +202,7 @@ BookmarkManagerView::BookmarkManagerView(Profile* profile) l10n_util::GetString(IDS_BOOKMARK_MANAGER_SEARCH_TITLE))); layout->AddView(search_tf_); - layout->AddPaddingRow(0, 3); // 3px padding between rows. + layout->AddPaddingRow(0, 3); // 3px padding between rows. layout->StartRow(1, split_cs_id); layout->AddView(split_view_); @@ -583,8 +583,10 @@ BookmarkTableModel* BookmarkManagerView::CreateSearchTableModel() { std::wstring search_text = search_tf_->text(); if (search_text.empty()) return NULL; - return BookmarkTableModel::CreateSearchTableModel(GetBookmarkModel(), - search_text); + std::wstring languages = + profile_->GetPrefs()->GetString(prefs::kAcceptLanguages); + return BookmarkTableModel::CreateSearchTableModel( + GetBookmarkModel(), search_text, languages); } void BookmarkManagerView::SetTableModel(BookmarkTableModel* new_table_model, |