Omnibox - Strip Extra Whitespace from Custom Search Engine Names

chrome/browser/ui/search_engines/template_url_table_model.cc

 // Copyright (c) 2012 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/ui/search_engines/template_url_table_model.h"
 
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "chrome/grit/generated_resources.h"
@@ skipping 242 matching lines @@
 }
 
 void TemplateURLTableModel::Add(int index,
                                 const base::string16& short_name,
                                 const base::string16& keyword,
                                 const std::string& url) {
   DCHECK(index >= 0 && index <= RowCount());
   DCHECK(!url.empty());
   template_url_service_->RemoveObserver(this);
   TemplateURLData data;
-  data.short_name = short_name;
+  data.SetShortName(short_name);
   data.SetKeyword(keyword);
   data.SetURL(url);
   TemplateURL* turl = new TemplateURL(data);
   template_url_service_->Add(turl);
   scoped_ptr<ModelEntry> entry(new ModelEntry(this, turl));
   template_url_service_->AddObserver(this);
   AddEntry(index, entry.Pass());
 }
 
 void TemplateURLTableModel::ModifyTemplateURL(int index,
@@ skipping 109 matching lines @@
   return entry.Pass();
 }
 
 void TemplateURLTableModel::AddEntry(int index, scoped_ptr<ModelEntry> entry) {
   entries_.insert(entries_.begin() + index, entry.release());
   if (index <= last_other_engine_index_)
     ++last_other_engine_index_;
   if (observer_)
     observer_->OnItemsAdded(index, 1);
 }