Index: chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc |
diff --git a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc |
index 79cc6c2b678c0ce749d0be2f8668ad00d90da2e0..d7df8fa6499fc4a0078cf8aedf28e7543bbfb5d2 100644 |
--- a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc |
+++ b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc |
@@ -17,6 +17,7 @@ |
#include "chrome/browser/themes/theme_service.h" |
#include "chrome/browser/ui/omnibox/omnibox_view.h" |
#include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
+#include "chrome/browser/ui/views/omnibox/inline_omnibox_popup_view.h" |
#include "chrome/browser/ui/views/omnibox/omnibox_result_view.h" |
#include "chrome/browser/ui/views/omnibox/touch_omnibox_popup_contents_view.h" |
#include "grit/chromium_strings.h" |
@@ -79,11 +80,24 @@ class OmniboxPopupContentsView::AutocompletePopupWidget |
//////////////////////////////////////////////////////////////////////////////// |
// OmniboxPopupContentsView, public: |
-OmniboxPopupContentsView* OmniboxPopupContentsView::CreateForEnvironment( |
+AutocompletePopupView* OmniboxPopupContentsView::Create( |
const gfx::Font& font, |
OmniboxView* omnibox_view, |
AutocompleteEditModel* edit_model, |
- views::View* location_bar) { |
+ views::View* location_bar, |
+ views::View* popup_parent_view) { |
+ // TODO(sky): add a flag to enable this. |
+ /* |
+ if (...) { |
+ InlineOmniboxPopupView* inline_view = |
+ new InlineOmniboxPopupView(font, omnibox_view, edit_model, |
+ location_bar); |
+ inline_view->Init(); |
+ popup_parent_view->AddChildView(inline_view); |
+ return inline_view; |
+ } |
+ */ |
+ |
OmniboxPopupContentsView* view = NULL; |
if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) { |
view = new TouchOmniboxPopupContentsView( |