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

chrome/browser/views/location_bar_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_VIEWS_LOCATION_BAR_VIEW_H_
 #define CHROME_BROWSER_VIEWS_LOCATION_BAR_VIEW_H_
 
 #include <string>
 #include <vector>
 
 #include "app/gfx/font.h"
 #include "base/gfx/rect.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/location_bar.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/toolbar_model.h"
 #include "chrome/browser/views/info_bubble.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
+#include "views/controls/native/native_view_host.h"
 #include "views/painter.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h"
-#include "views/controls/hwnd_view.h"
 #else
 #include "chrome/browser/autocomplete/autocomplete_edit_view_gtk.h"
-#include "views/controls/native_view_host_gtk.h"
 #endif
 
 class AutocompletePopupPositioner;
 class CommandUpdater;
 class GURL;
 class PageAction;
 class Profile;
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ skipping 422 matching lines @@
   // The user's desired disposition for how their input should be opened
   WindowOpenDisposition disposition_;
 
   // The transition type to use for the navigation
   PageTransition::Type transition_;
 
   // Font used by edit and some of the hints.
   gfx::Font font_;
 
   // Location_entry view wrapper
-#if defined(OS_WIN)
-  views::HWNDView* location_entry_view_;
-#else
-  views::NativeViewHostGtk* location_entry_view_;
-#endif
+  views::NativeViewHost* location_entry_view_;
 
   // The following views are used to provide hints and remind the user as to
   // what is going in the edit. They are all added a children of the
   // LocationBarView. At most one is visible at a time. Preference is
   // given to the keyword_view_, then hint_view_, then type_to_search_view_.
 
   // Shown if the user has selected a keyword.
   SelectedKeywordView selected_keyword_view_;
 
   // Shown if the selected url has a corresponding keyword.
@@ skipping 16 matching lines @@
   bool popup_window_mode_;
 
   // Used schedule a task for the first run info bubble.
   ScopedRunnableMethodFactory<LocationBarView> first_run_bubble_;
 
   // The positioner that places the autocomplete popup.
   AutocompletePopupPositioner* popup_positioner_;
 };
 
 #endif  // CHROME_BROWSER_VIEWS_LOCATION_BAR_VIEW_H_