Merge AutocompleteTextfield views::Textfield subclass into OmniboxView.

chrome/browser/ui/views/location_bar/location_bar_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/location_bar/location_bar_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/command_line.h"
@@ skipping 225 matching lines @@
   location_icon_view_->set_drag_controller(this);
   AddChildView(location_icon_view_);
 
   ev_bubble_view_ =
       new EVBubbleView(kEVBubbleBackgroundImages, IDR_OMNIBOX_HTTPS_VALID,
                        GetColor(ToolbarModel::EV_SECURE, SECURITY_TEXT),
                        this);
   ev_bubble_view_->set_drag_controller(this);
   AddChildView(ev_bubble_view_);
 
-  // URL edit field.
-  // View container for URL edit field.
+  // Initialize the Omnibox view.
   location_entry_.reset(CreateOmniboxView(this, model_, profile_,
       command_updater_, mode_ == POPUP, this));
   SetLocationEntryFocusable(true);
-
   location_entry_view_ = location_entry_->AddToView(this);
-  location_entry_view_->set_id(VIEW_ID_AUTOCOMPLETE);
 
   selected_keyword_view_ = new SelectedKeywordView(
       kSelectedKeywordBackgroundImages, IDR_KEYWORD_SEARCH_MAGNIFIER,
       GetColor(ToolbarModel::NONE, TEXT),
       profile_);
   selected_keyword_view_->SetFont(font_);
   AddChildView(selected_keyword_view_);
 
   keyword_hint_view_ = new KeywordHintView(profile_, this);
   keyword_hint_view_->SetFont(font_);
@@ skipping 359 matching lines @@
   SchedulePaint();
 }
 
 string16 LocationBarView::GetInstantSuggestion() const {
   return HasValidSuggestText() ? suggested_text_view_->text() : string16();
 }
 
 void LocationBarView::SetLocationEntryFocusable(bool focusable) {
   OmniboxViewViews* omnibox_views = GetOmniboxViewViews(location_entry_.get());
   if (omnibox_views)
-    omnibox_views->SetLocationEntryFocusable(focusable);
+    omnibox_views->set_focusable(focusable);
   else
     set_focusable(focusable);
 }
 
 bool LocationBarView::IsLocationEntryFocusableInRootView() const {
   OmniboxViewViews* omnibox_views = GetOmniboxViewViews(location_entry_.get());
-  if (omnibox_views)
-    return omnibox_views->IsLocationEntryFocusableInRootView();
-  return views::View::IsFocusable();
+  return omnibox_views ? omnibox_views->IsFocusable() : View::IsFocusable();
 }
 
 gfx::Size LocationBarView::GetPreferredSize() {
   int sizing_image_id = mode_ == POPUP ? IDR_LOCATIONBG_POPUPMODE_CENTER :
                                          IDR_LOCATION_BAR_BORDER;
   return gfx::Size(
       0, GetThemeProvider()->GetImageSkiaNamed(sizing_image_id)->height());
 }
 
 void LocationBarView::Layout() {
@@ skipping 805 matching lines @@
 int LocationBarView::GetInternalHeight(bool use_preferred_size) {
   int total_height =
       use_preferred_size ? GetPreferredSize().height() : height();
   return std::max(total_height - (kVerticalEdgeThickness * 2), 0);
 }
 
 bool LocationBarView::HasValidSuggestText() const {
   return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&
       !suggested_text_view_->text().empty();
 }