Merge 144001 - Update BrowserView::ProcessFullscreen OmniboxViewWin use; etc.

chrome/browser/ui/views/omnibox/omnibox_views.h

Index: chrome/browser/ui/views/omnibox/omnibox_views.h
===================================================================
--- chrome/browser/ui/views/omnibox/omnibox_views.h	(revision 144960)
+++ chrome/browser/ui/views/omnibox/omnibox_views.h	(working copy)
@@ -10,9 +10,27 @@
 class CommandUpdater;
 class LocationBarView;
 class OmniboxView;
+class OmniboxViewViews;
+class OmniboxViewWin;
 class Profile;
 class ToolbarModel;
 
+namespace views {
+class View;
+}

[Peter Kasting, 2012/06/29 20:15:28]

Nit: This views::View forward declaration not needed (or part of your original
trunk change).

[msw, 2012/06/29 20:20:29]

Done.

+
+// Returns true if OmniboxViewViews should be used (instead of OmniboxViewWin).
+bool UseOmniboxViews();
+
+// Return |view| as an OmniboxViewViews, or NULL if it is of a different type.
+OmniboxViewViews* GetOmniboxViewViews(OmniboxView* view);
+
+#if defined(OS_WIN) && !defined(USE_AURA)
+// Return |view| as an OmniboxViewWin, or NULL if it is of a different type.
+OmniboxViewWin* GetOmniboxViewWin(OmniboxView* view);
+#endif
+
+// Creates an OmniboxView of the appropriate type; Views or Win.
 OmniboxView* CreateOmniboxView(AutocompleteEditController* controller,
                                ToolbarModel* toolbar_model,
                                Profile* profile,