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

chrome/browser/ui/views/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/views/edit_search_engine_dialog.h"
 
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/template_url.h"
@@ skipping 10 matching lines @@
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
 using views::GridLayout;
 using views::ImageView;
 using views::Textfield;
 
 
-namespace {
-// Converts a URL as understood by TemplateURL to one appropriate for display
-// to the user.
-string16 GetDisplayURL(const TemplateURL& turl) {
-  return turl.url() ? turl.url()->DisplayURL() : string16();
-}
-}  // namespace
-
 namespace browser {
 
 void EditSearchEngine(gfx::NativeWindow parent,
                       const TemplateURL* template_url,
                       EditSearchEngineControllerDelegate* delegate,
                       Profile* profile) {
   EditSearchEngineDialog::Show(parent, template_url, delegate, profile);
 }
 
 }  // namespace browser
@@ skipping 73 matching lines @@
     const views::KeyEvent& key_event) {
   return false;
 }
 
 void EditSearchEngineDialog::Init() {
   // Create the views we'll need.
   if (controller_->template_url()) {
     title_tf_ = CreateTextfield(controller_->template_url()->short_name(),
                                 false);
     keyword_tf_ = CreateTextfield(controller_->template_url()->keyword(), true);
-    url_tf_ = CreateTextfield(GetDisplayURL(*controller_->template_url()),
-                              false);
+    url_tf_ = CreateTextfield(
+        controller_->template_url()->url_ref().DisplayURL(), false);
     // We don't allow users to edit prepopulate URLs. This is done as
     // occasionally we need to update the URL of prepopulated TemplateURLs.
     url_tf_->SetReadOnly(controller_->template_url()->prepopulate_id() != 0);
   } else {
     title_tf_ = CreateTextfield(string16(), false);
     keyword_tf_ = CreateTextfield(string16(), true);
     url_tf_ = CreateTextfield(string16(), false);
   }
   title_iv_ = new ImageView();
   keyword_iv_ = new ImageView();
@@ skipping 124 matching lines @@
     image_view->SetImage(
         ResourceBundle::GetSharedInstance().GetBitmapNamed(
             IDR_INPUT_GOOD));
   } else {
     image_view->SetTooltipText(l10n_util::GetStringUTF16(invalid_message_id));
     image_view->SetImage(
         ResourceBundle::GetSharedInstance().GetBitmapNamed(
             IDR_INPUT_ALERT));
   }
 }