Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(382)

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm

Issue 8598015: Do not allow multiline input when naming bookmarks/folders on Mac (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Single Line Mode nibs; Move header; Bookmarks are now single line Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h" 5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h"
6 6
7 #include "base/mac/mac_util.h" 7 #include "base/mac/mac_util.h"
8 #include "base/sys_string_conversions.h" 8 #include "base/sys_string_conversions.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h" 10 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 contextInfo:nil]; 83 contextInfo:nil];
84 } 84 }
85 85
86 - (IBAction)cancel:(id)sender { 86 - (IBAction)cancel:(id)sender {
87 [NSApp endSheet:[self window]]; 87 [NSApp endSheet:[self window]];
88 } 88 }
89 89
90 - (IBAction)ok:(id)sender { 90 - (IBAction)ok:(id)sender {
91 NSString* name = [nameField_ stringValue]; 91 NSString* name = [nameField_ stringValue];
92 BookmarkModel* model = profile_->GetBookmarkModel(); 92 BookmarkModel* model = profile_->GetBookmarkModel();
93
Ilya Sherman 2011/11/22 01:18:16 nit: Since you're not making any other changes in
93 if (node_) { 94 if (node_) {
94 model->SetTitle(node_, base::SysNSStringToUTF16(name)); 95 model->SetTitle(node_, base::SysNSStringToUTF16(name));
95 } else { 96 } else {
96 model->AddFolder(parent_, 97 model->AddFolder(parent_,
97 newIndex_, 98 newIndex_,
98 base::SysNSStringToUTF16(name)); 99 base::SysNSStringToUTF16(name));
99 } 100 }
100 [NSApp endSheet:[self window]]; 101 [NSApp endSheet:[self window]];
101 } 102 }
102 103
(...skipping 11 matching lines...) Expand all
114 115
115 - (void)setFolderName:(NSString*)name { 116 - (void)setFolderName:(NSString*)name {
116 [nameField_ setStringValue:name]; 117 [nameField_ setStringValue:name];
117 } 118 }
118 119
119 - (NSButton*)okButton { 120 - (NSButton*)okButton {
120 return okButton_; 121 return okButton_;
121 } 122 }
122 123
123 @end // BookmarkNameFolderController 124 @end // BookmarkNameFolderController
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698