Move the URL string from TemplateURLRef onto the owning TemplateURL. This will make it easier to m…

chrome/browser/ui/gtk/edit_search_engine_dialog.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/gtk/edit_search_engine_dialog.h"
 
 #include <gtk/gtk.h>
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #include "chrome/browser/ui/search_engines/edit_search_engine_controller.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 
 namespace {
 
-std::string GetDisplayURL(const TemplateURL& turl) {
-  return turl.url() ? UTF16ToUTF8(turl.url()->DisplayURL()) : std::string();
-}
-
 // Forces text to lowercase when connected to an editable's "insert-text"
 // signal.  (Like views Textfield::STYLE_LOWERCASE.)
 void LowercaseInsertTextHandler(GtkEditable *editable, const gchar *text,
                                 gint length, gint *position, gpointer data) {
   string16 original_text = UTF8ToUTF16(text);
   string16 lower_text = base::i18n::ToLower(original_text);
   if (lower_text != original_text) {
     std::string result = UTF16ToUTF8(lower_text);
     // Prevent ourselves getting called recursively about our own edit.
     g_signal_handlers_block_by_func(G_OBJECT(editable),
@@ skipping 102 matching lines @@
 
   if (controller_->template_url()) {
     gtk_entry_set_text(
         GTK_ENTRY(title_entry_),
         UTF16ToUTF8(controller_->template_url()->short_name()).c_str());
     gtk_entry_set_text(
         GTK_ENTRY(keyword_entry_),
         UTF16ToUTF8(controller_->template_url()->keyword()).c_str());
     gtk_entry_set_text(
         GTK_ENTRY(url_entry_),
-        GetDisplayURL(*controller_->template_url()).c_str());
+        UTF16ToUTF8(controller_->template_url()->url_ref().DisplayURL()).
+            c_str());
     // We don't allow users to edit prepopulated URLs.
     gtk_editable_set_editable(
         GTK_EDITABLE(url_entry_),
         controller_->template_url()->prepopulate_id() == 0);
 
     if (controller_->template_url()->prepopulate_id() != 0) {
       GtkWidget* fake_label = gtk_label_new("Fake label");
       gtk_widget_set_sensitive(fake_label,
           controller_->template_url()->prepopulate_id() == 0);
       GtkStyle* label_style = gtk_widget_get_style(fake_label);
@@ skipping 103 matching lines @@
                                  GetURLInput());
   } else {
     controller_->CleanUpCancelledAdd();
   }
   gtk_widget_destroy(dialog_);
 }
 
 void EditSearchEngineDialog::OnWindowDestroy(GtkWidget* widget) {
   MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }