summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/bookmark_bubble_controller.mm
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/cocoa/bookmark_bubble_controller.mm')
-rw-r--r--chrome/browser/cocoa/bookmark_bubble_controller.mm9
1 files changed, 4 insertions, 5 deletions
diff --git a/chrome/browser/cocoa/bookmark_bubble_controller.mm b/chrome/browser/cocoa/bookmark_bubble_controller.mm
index 4b8d154..0258d0d 100644
--- a/chrome/browser/cocoa/bookmark_bubble_controller.mm
+++ b/chrome/browser/cocoa/bookmark_bubble_controller.mm
@@ -278,7 +278,7 @@ void BookmarkBubbleNotificationBridge::Observe(
- (IBAction)remove:(id)sender {
[self stopPulsingBookmarkButton];
// TODO(viettrungluu): get rid of conversion and utf_string_conversions.h.
- model_->SetURLStarred(node_->GetURL(), node_->GetTitleAsString16(), false);
+ model_->SetURLStarred(node_->GetURL(), node_->GetTitle(), false);
UserMetrics::RecordAction(UserMetricsAction("BookmarkBubble_Unstar"),
model_->profile());
node_ = NULL; // no longer valid
@@ -323,7 +323,7 @@ void BookmarkBubbleNotificationBridge::Observe(
if (!node_) return;
// First the title...
- NSString* oldTitle = base::SysUTF16ToNSString(node_->GetTitleAsString16());
+ NSString* oldTitle = base::SysUTF16ToNSString(node_->GetTitle());
NSString* newTitle = [nameTextField_ stringValue];
if (![oldTitle isEqual:newTitle]) {
model_->SetTitle(node_, base::SysNSStringToUTF16(newTitle));
@@ -352,8 +352,7 @@ void BookmarkBubbleNotificationBridge::Observe(
// Fill in all information related to the folder pop up button.
- (void)fillInFolderList {
- [nameTextField_
- setStringValue:base::SysUTF16ToNSString(node_->GetTitleAsString16())];
+ [nameTextField_ setStringValue:base::SysUTF16ToNSString(node_->GetTitle())];
DCHECK([folderPopUpButton_ numberOfItems] == 0);
[self addFolderNodes:model_->root_node()
toPopUpButton:folderPopUpButton_
@@ -387,7 +386,7 @@ void BookmarkBubbleNotificationBridge::Observe(
toPopUpButton:(NSPopUpButton*)button
indentation:(int)indentation {
if (!model_->is_root(parent)) {
- NSString* title = base::SysUTF16ToNSString(parent->GetTitleAsString16());
+ NSString* title = base::SysUTF16ToNSString(parent->GetTitle());
NSMenu* menu = [button menu];
NSMenuItem* item = [menu addItemWithTitle:title
action:NULL