Do not allow multiline input when naming bookmarks/folders on Mac

chrome/browser/bookmarks/bookmark_model.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/bookmarks/bookmark_model.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_vector.h"
+#include "base/string_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/bookmarks/bookmark_expanded_state_tracker.h"
 #include "chrome/browser/bookmarks/bookmark_index.h"
 #include "chrome/browser/bookmarks/bookmark_model_observer.h"
 #include "chrome/browser/bookmarks/bookmark_storage.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 274 matching lines @@
   DCHECK(node);
   if (!node->is_favicon_loaded()) {
     BookmarkNode* mutable_node = AsMutable(node);
     mutable_node->set_is_favicon_loaded(true);
     LoadFavicon(mutable_node);
   }
   return node->favicon();
 }
 
 void BookmarkModel::SetTitle(const BookmarkNode* node, const string16& title) {
+  // Remove extra whitespace from Folder/Bookmark names.

[Ilya Sherman, 2011/11/22 01:18:16]

nit: No need to capitalize "folder" or "bookmark" here.

+  string16 mutable_title = CollapseWhitespace(title, false);
+
   if (!node) {
     NOTREACHED();
     return;
   }
-  if (node->GetTitle() == title)
+  if (node->GetTitle() == mutable_title)
     return;
 
   if (is_permanent_node(node)) {
     NOTREACHED();
     return;
   }
 
   // The title index doesn't support changing the title, instead we remove then
   // add it back.
   index_->Remove(node);
-  AsMutable(node)->set_title(title);
+  AsMutable(node)->set_title(mutable_title);
   index_->Add(node);
 
   if (store_.get())
     store_->ScheduleSave();
 
   FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
                     BookmarkNodeChanged(this, node));
 }
 
 void BookmarkModel::SetURL(const BookmarkNode* node, const GURL& url) {
@@ skipping 95 matching lines @@
                                              int index,
                                              const string16& title) {
   if (!loaded_ || is_root_node(parent) || !IsValidIndex(parent, index, true)) {
     // Can't add to the root.
     NOTREACHED();
     return NULL;
   }
 
   BookmarkNode* new_node = new BookmarkNode(generate_next_node_id(), GURL());
   new_node->set_date_folder_modified(Time::Now());
-  new_node->set_title(title);
+  // Folders shouldn't have line breaks in their titles.
+  new_node->set_title(CollapseWhitespace(title, false));
   new_node->set_type(BookmarkNode::FOLDER);
 
   return AddNode(AsMutable(parent), index, new_node, false);
 }
 
 const BookmarkNode* BookmarkModel::AddURL(const BookmarkNode* parent,
                                           int index,
                                           const string16& title,
                                           const GURL& url) {
   return AddURLWithCreationTime(parent, index, title, url, Time::Now());
@@ skipping 379 matching lines @@
   return next_node_id_++;
 }
 
 BookmarkLoadDetails* BookmarkModel::CreateLoadDetails() {
   BookmarkNode* bb_node = CreatePermanentNode(BookmarkNode::BOOKMARK_BAR);
   BookmarkNode* other_node = CreatePermanentNode(BookmarkNode::OTHER_NODE);
   BookmarkNode* synced_node = CreatePermanentNode(BookmarkNode::SYNCED);
   return new BookmarkLoadDetails(bb_node, other_node, synced_node,
                                  new BookmarkIndex(profile_), next_node_id_);
 }