summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorsky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-07 23:05:11 +0000
committersky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-07 23:05:11 +0000
commitb5c7c2e842d66ab1ccbac33a7c8569826e4de602 (patch)
treeb6b33a7b54363e7b9f1dd02054851ab36c9a54c9 /chrome
parentb6be588e0c3d01b785ae04eef177b2f1e6526f28 (diff)
downloadchromium_src-b5c7c2e842d66ab1ccbac33a7c8569826e4de602.zip
chromium_src-b5c7c2e842d66ab1ccbac33a7c8569826e4de602.tar.gz
chromium_src-b5c7c2e842d66ab1ccbac33a7c8569826e4de602.tar.bz2
Fixes bug in building filter string for open dialog that resulted in
showing garbage in files types combobox. BUG=4211 TEST=bring up bookmark manager, click on import, click on 'files of type' and make sure you only see *.html. Review URL: http://codereview.chromium.org/10225 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5026 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/views/bookmark_manager_view.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/views/bookmark_manager_view.cc b/chrome/browser/views/bookmark_manager_view.cc
index 0c967a5..41698fb 100644
--- a/chrome/browser/views/bookmark_manager_view.cc
+++ b/chrome/browser/views/bookmark_manager_view.cc
@@ -698,7 +698,8 @@ void BookmarkManagerView::ShowImportBookmarksFileChooser() {
// TODO(sky): need a textual description here once we can add new
// strings.
- std::wstring filter_string(L"*.html\0*.html\0\0");
+ const wchar_t filter_c_str[] = L"*.html\0*.html\0\0\0";
+ std::wstring filter_string(filter_c_str, arraysize(filter_c_str));
select_file_dialog_ = SelectFileDialog::Create(this);
select_file_dialog_->SelectFile(
SelectFileDialog::SELECT_OPEN_FILE, std::wstring(), std::wstring(),