Refactors HWNDView, NativeViewHostGtk and NativeViewHost so that they match t...

chrome/browser/views/location_bar_view.cc

 // Copyright (c) 2009 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/views/location_bar_view.h"
 
 #include "app/gfx/canvas.h"
 #include "app/gfx/favicon_size.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 120 matching lines @@
 
   // URL edit field.
   // View container for URL edit field.
 #if defined(OS_WIN)
   views::Widget* widget = GetWidget();
   location_entry_.reset(new AutocompleteEditViewWin(font_, this, model_, this,
                                                     widget->GetNativeView(),
                                                     profile_, command_updater_,
                                                     popup_window_mode_,
                                                     popup_positioner_));
-  location_entry_view_ = new views::HWNDView;
 #else
   location_entry_.reset(new AutocompleteEditViewGtk(this, model_, profile_,
                                                     command_updater_,
                                                     popup_positioner_));
-  location_entry_view_ = new views::NativeViewHostGtk;
 #endif
-  DCHECK(location_entry_view_) << "LocationBarView::Init - OOM!";
+  location_entry_view_ = new views::NativeViewHost;
   location_entry_view_->SetID(VIEW_ID_AUTOCOMPLETE);
   AddChildView(location_entry_view_);
-  location_entry_view_->SetAssociatedFocusView(this);
+  location_entry_view_->set_focus_view(this);
+  location_entry_view_->Attach(
 #if defined(OS_WIN)
-  location_entry_view_->Attach(location_entry_->m_hWnd);
+                               location_entry_->m_hWnd
 #else
-  location_entry_view_->Attach(location_entry_->widget());
+                               location_entry_->widget()
 #endif
+                               );
 
   AddChildView(&selected_keyword_view_);
   selected_keyword_view_.SetFont(font_);
   selected_keyword_view_.SetVisible(false);
   selected_keyword_view_.SetParentOwned(false);
 
 #if defined(OS_WIN)
   DWORD sys_color = GetSysColor(COLOR_GRAYTEXT);
   SkColor gray = SkColorSetRGB(GetRValue(sys_color), GetGValue(sys_color),
                                GetBValue(sys_color));
@@ skipping 1169 matching lines @@
   location_entry_->SetFocus();
 }
 
 void LocationBarView::SaveStateToContents(TabContents* contents) {
   location_entry_->SaveStateToTab(contents);
 }
 
 void LocationBarView::Revert() {
   location_entry_->RevertAll();
 }