Merge NativeTextfieldViews into views::Textfield.

chrome/browser/ui/views/bookmarks/bookmark_editor_view.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/bookmarks/bookmark_editor_view.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 406 matching lines @@
   context_menu_runner_.reset();
 
   if (parent())
     ExpandAndSelect();
 }
 
 GURL BookmarkEditorView::GetInputURL() const {
   if (details_.GetNodeType() == BookmarkNode::FOLDER)
     return GURL();
   return URLFixerUpper::FixupURL(
-      base::UTF16ToUTF8(url_tf_->text()), std::string());
+      base::UTF16ToUTF8(url_tf_->GetText()), std::string());
 }
 
 void BookmarkEditorView::UserInputChanged() {
   if (details_.GetNodeType() != BookmarkNode::FOLDER) {
     const GURL url(GetInputURL());
     if (!url.is_valid())
       url_tf_->SetBackgroundColor(kErrorColor);
     else
       url_tf_->UseDefaultBackgroundColor();
   }
@@ skipping 99 matching lines @@
 
 void BookmarkEditorView::ApplyEdits(EditorNode* parent) {
   DCHECK(!show_tree_ || parent);
 
   // We're going to apply edits to the bookmark bar model, which will call us
   // back. Normally when a structural edit occurs we reset the tree model.
   // We don't want to do that here, so we remove ourselves as an observer.
   bb_model_->RemoveObserver(this);
 
   GURL new_url(GetInputURL());
-  base::string16 new_title(title_tf_->text());
+  base::string16 new_title(title_tf_->GetText());
 
   if (!show_tree_) {
     BookmarkEditor::ApplyEditsWithNoFolderChange(
         bb_model_, parent_, details_, new_title, new_url);
     return;
   }
 
   // Create the new folders and update the titles.
   const BookmarkNode* new_parent = NULL;
   ApplyNameChangesAndCreateNewFolders(
@@ skipping 67 matching lines @@
   }
   return context_menu_model_.get();
 }
 
 void BookmarkEditorView::EditorTreeModel::SetTitle(
     ui::TreeModelNode* node,
     const base::string16& title) {
   if (!title.empty())
     ui::TreeNodeModel<EditorNode>::SetTitle(node, title);
 }