Use OmniboxViewViews on Win with --enable-views-textfield.

chrome/browser/ui/views/omnibox/omnibox_view_views.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/omnibox/omnibox_view_views.h"
 
 #include "base/property_bag.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 29 matching lines @@
 #include "ui/views/events/event.h"
 #include "ui/views/ime/input_method.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/views_delegate.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window.h"
 #endif
 
-#if defined(OS_WIN)
-#include "chrome/browser/ui/views/omnibox/omnibox_view_win.h"
-#endif
-
 using content::WebContents;
 
 namespace {
 
 // Textfield for autocomplete that intercepts events that are necessary
 // for OmniboxViewViews.
 class AutocompleteTextfield : public views::Textfield {
  public:
   explicit AutocompleteTextfield(OmniboxViewViews* omnibox_view)
       : views::Textfield(views::Textfield::STYLE_DEFAULT),
@@ skipping 601 matching lines @@
     model_->OnChanged();
 
   return something_changed;
 }
 
 gfx::NativeView OmniboxViewViews::GetNativeView() const {
   return GetWidget()->GetNativeView();
 }
 
 gfx::NativeView OmniboxViewViews::GetRelativeWindowForPopup() const {
-#if defined(OS_WIN) && !defined(USE_AURA)
-  return OmniboxViewWin::GetRelativeWindowForNativeView(GetNativeView());
-#else
   return GetWidget()->GetTopLevelWidget()->GetNativeView();
-#endif
 }
 
 CommandUpdater* OmniboxViewViews::GetCommandUpdater() {
   return command_updater_;
 }
 
 void OmniboxViewViews::SetInstantSuggestion(const string16& input,
                                             bool animate_to_complete) {
 #if defined(OS_WIN) || defined(USE_AURA)
   location_bar_view_->SetInstantSuggestion(input, animate_to_complete);
@@ skipping 203 matching lines @@
                                                const ui::Range& range) {
   if (text != GetText())
     textfield_->SetText(text);
   textfield_->SelectRange(range);
 }
 
 string16 OmniboxViewViews::GetSelectedText() const {
   // TODO(oshima): Support instant, IME.
   return textfield_->GetSelectedText();
 }
-
-#if defined(USE_AURA)
-// static
-OmniboxView* OmniboxView::CreateOmniboxView(
-    AutocompleteEditController* controller,
-    ToolbarModel* toolbar_model,
-    Profile* profile,
-    CommandUpdater* command_updater,
-    bool popup_window_mode,
-    LocationBarView* location_bar) {
-  OmniboxViewViews* omnibox_view = new OmniboxViewViews(controller,
-                                                        toolbar_model,
-                                                        profile,
-                                                        command_updater,
-                                                        popup_window_mode,
-                                                        location_bar);
-  omnibox_view->Init();
-  return omnibox_view;
-}
-#endif