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

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_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: pointer placement nit; move category into header file 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
index 340115ad3e7424a8ab24bd76003a99851d4bbc5a..bbf6628a7895be5dcae0f9ac9c05e3e7076a5f26 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
@@ -13,6 +13,7 @@
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/profiles/profile.h"
#import "chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.h"
+#import "chrome/browser/ui/cocoa/bookmarks/bookmark_cell_single_line.h"
#import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h"
#import "chrome/browser/ui/cocoa/bookmarks/bookmark_tree_browser_cell.h"
#import "chrome/browser/ui/cocoa/browser_window_controller.h"
@@ -564,6 +565,14 @@ class BookmarkEditorBaseControllerBridge : public BookmarkModelObserver {
[self setTableSelectionPath:selection];
NSInteger row = [folderTreeView_ selectedRow];
DCHECK(row >= 0);
+
+ // Put the cell into single-line mode before putting it into edit mode.
+ NSCell* folderCell = [folderTreeView_ preparedCellAtColumn:0 row:row];
+ if ([folderCell
+ respondsToSelector:@selector(setUsesSingleLineMode:)]) {
+ [folderCell setUsesSingleLineMode:YES];
+ }
+
[folderTreeView_ editColumn:0 row:row withEvent:nil select:YES];
}
}

Powered by Google App Engine
This is Rietveld 408576698