Add an option to run Chrome in the views desktop.

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

Index: chrome/browser/ui/views/location_bar/location_bar_view.h
===================================================================
--- chrome/browser/ui/views/location_bar/location_bar_view.h	(revision 89890)
+++ chrome/browser/ui/views/location_bar/location_bar_view.h	(working copy)
@@ -329,6 +329,14 @@
 
   // Returns true if the suggest text is valid.
   bool HasValidSuggestText() const;
+
+  // Returns |location_entry_| cast to OmniboxViewWin, or NULL if
+  // |location_entry_| is of a different type.
+  OmniboxViewWin* GetOmniboxViewWin();
+
+  // Returns true if the views-based omnibox should be used. When false,
+  // |location_entry_| can be cast to OmniboxViewWin.
+  static bool UseViewsOmnibox();
 #endif
 
   // Helper to show the first run info bubble.
@@ -338,11 +346,7 @@
   Profile* profile_;
 
   // The Autocomplete Edit field.
-#if defined(OS_WIN)
-  scoped_ptr<OmniboxViewWin> location_entry_;
-#else
   scoped_ptr<OmniboxView> location_entry_;
-#endif
 
   // The Browser object that corresponds to this View.
   Browser* browser_;