Preliminary work to allow Chrome to build with USE_AURA

chrome/browser/ui/views/location_bar/location_bar_view.cc

 // Copyright (c) 2011 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"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 158 matching lines @@
   ev_bubble_view_ =
       new EVBubbleView(kEVBubbleBackgroundImages, IDR_OMNIBOX_HTTPS_VALID,
                        GetColor(ToolbarModel::EV_SECURE, SECURITY_TEXT), this);
   AddChildView(ev_bubble_view_);
   ev_bubble_view_->SetVisible(false);
   ev_bubble_view_->set_drag_controller(this);
 
   // URL edit field.
   // View container for URL edit field.
   Profile* profile = browser_->profile();
-#if defined(OS_WIN)
+#if defined(USE_AURA)
+  OmniboxViewViews* omnibox_view = new OmniboxViewViews(this, model_, profile,
+      browser_->command_updater(), mode_ == POPUP, this);
+  omnibox_view->Init();
+  location_entry_.reset(omnibox_view);
+#elif defined(OS_WIN)
   if (views::Widget::IsPureViews()) {
     OmniboxViewViews* omnibox_view = new OmniboxViewViews(this, model_, profile,
         browser_->command_updater(), mode_ == POPUP, this);
     omnibox_view->Init();
     location_entry_.reset(omnibox_view);
   } else {
     location_entry_.reset(new OmniboxViewWin(font_, this, model_, this,
         GetWidget()->GetNativeView(), browser_->command_updater(),
         mode_ == POPUP, this));
   }
@@ skipping 1056 matching lines @@
 bool LocationBarView::HasValidSuggestText() const {
   return suggested_text_view_ && !suggested_text_view_->size().IsEmpty() &&
       !suggested_text_view_->GetText().empty();
 }
 
 OmniboxViewWin* LocationBarView::GetOmniboxViewWin() {
   CHECK(!views::Widget::IsPureViews());
   return static_cast<OmniboxViewWin*>(location_entry_.get());
 }
 #endif