summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/bookmark_bubble_view.cc
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-01 18:37:39 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-01 18:37:39 +0000
commit680ed93e5e315143eb7e7478e21d2080689cbd07 (patch)
tree314dce7a8f82ba13446de7d30a55393835fca4b6 /chrome/browser/views/bookmark_bubble_view.cc
parentef610457ca8d0d43594a765e2b1f1ea194c5a591 (diff)
downloadchromium_src-680ed93e5e315143eb7e7478e21d2080689cbd07.zip
chromium_src-680ed93e5e315143eb7e7478e21d2080689cbd07.tar.gz
chromium_src-680ed93e5e315143eb7e7478e21d2080689cbd07.tar.bz2
Porting textfield to toolkit_views Gtk.
BUG=None TEST=Run the view unit-tests. See original review: http://codereview.chromium.org/165512/show Review URL: http://codereview.chromium.org/180061 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25063 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/bookmark_bubble_view.cc')
-rw-r--r--chrome/browser/views/bookmark_bubble_view.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc
index 545eb4a6..0ecf1b9 100644
--- a/chrome/browser/views/bookmark_bubble_view.cc
+++ b/chrome/browser/views/bookmark_bubble_view.cc
@@ -8,6 +8,7 @@
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
#include "base/keyboard_codes.h"
+#include "base/string_util.h"
#include "chrome/app/chrome_dll_resource.h"
#include "chrome/browser/bookmarks/bookmark_editor.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
@@ -290,7 +291,7 @@ void BookmarkBubbleView::Init() {
layout->AddView(
new Label(l10n_util::GetString(IDS_BOOMARK_BUBBLE_TITLE_TEXT)));
title_tf_ = new views::Textfield();
- title_tf_->SetText(GetTitle());
+ title_tf_->SetText(WideToUTF16(GetTitle()));
layout->AddView(title_tf_);
layout->AddPaddingRow(0, kRelatedControlSmallVerticalSpacing);
@@ -420,7 +421,7 @@ void BookmarkBubbleView::ApplyEdits() {
BookmarkModel* model = profile_->GetBookmarkModel();
const BookmarkNode* node = model->GetMostRecentlyAddedNodeForURL(url_);
if (node) {
- const std::wstring new_title = title_tf_->text();
+ const std::wstring new_title = UTF16ToWide(title_tf_->text());
if (new_title != node->GetTitle()) {
model->SetTitle(node, new_title);
UserMetrics::RecordAction(L"BookmarkBubble_ChangeTitleInBubble",