Basic metro snap view omnibox.

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

Index: chrome/browser/ui/views/omnibox/omnibox_views.cc
diff --git a/chrome/browser/ui/views/omnibox/omnibox_views.cc b/chrome/browser/ui/views/omnibox/omnibox_views.cc
index 498446f286d956478b59a5bc93bdd827eb92756c..5e3d5c3e4845bd57d013ff864d514f4116006fa0 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_views.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_views.cc
@@ -37,17 +37,25 @@ OmniboxView* CreateOmniboxView(OmniboxEditController* controller,
                                ToolbarModel* toolbar_model,
                                Profile* profile,
                                CommandUpdater* command_updater,
-                               bool popup_window_mode,
+                               OmniboxWindowMode window_mode,
                                LocationBarView* location_bar,
                                views::View* popup_parent_view) {
+
+  // TODO(robertshield): Duplicating the enums is ugly. Ask sky@ about a nicer
+  // way of organizing this.
+  OmniboxView::WindowMode omnibox_window_mode =
+      (window_mode == OMNIBOX_WINDOW_MODE_NORMAL) ? OmniboxView::NORMAL :
+      (window_mode == OMNIBOX_WINDOW_MODE_POPUP) ?  OmniboxView::POPUP :
+                                                    OmniboxView::DISABLED;
+
 #if defined(OS_WIN) && !defined(USE_AURA)
   if (!UseOmniboxViews())
     return new OmniboxViewWin(controller, toolbar_model, location_bar,
-                              command_updater, popup_window_mode, location_bar,
-                              popup_parent_view);
+                              command_updater, omnibox_window_mode,
+                              location_bar, popup_parent_view);
 #endif
   OmniboxViewViews* omnibox = new OmniboxViewViews(controller, toolbar_model,
-      profile, command_updater, popup_window_mode, location_bar);
+      profile, command_updater, omnibox_window_mode, location_bar);
   omnibox->Init(popup_parent_view);
   return omnibox;
 }