Reland Merge NativeTextfieldViews into views::Textfield.

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 41 matching lines @@
 class TranslateIconView;
 class ZoomView;
 
 namespace content {
 struct SSLStatus;
 }
 
 namespace views {
 class BubbleDelegateView;
 class ImageButton;
+class ImageView;
 class Label;
 class LabelButton;
 class Widget;
 }
 
 /////////////////////////////////////////////////////////////////////////////
 //
 // LocationBarView class
 //
 //   The LocationBarView class is a View subclass that paints the background
@@ skipping 452 matching lines @@
   // Used to register for notifications received by NotificationObserver.
   content::NotificationRegistrar registrar_;
 
   // Used to bind callback functions to this object.
   base::WeakPtrFactory<LocationBarView> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(LocationBarView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_