| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/views/omnibox/omnibox_views.h" | 5 #include "chrome/browser/ui/views/omnibox/omnibox_views.h" |
| 6 | 6 |
| 7 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h" | 7 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h" |
| 8 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 8 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
| 9 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" | 9 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" |
| 10 #include "ui/views/controls/textfield/textfield.h" | 10 #include "ui/views/controls/textfield/textfield.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 return NULL; | 26 return NULL; |
| 27 #endif | 27 #endif |
| 28 } | 28 } |
| 29 | 29 |
| 30 OmniboxView* CreateOmniboxView(OmniboxEditController* controller, | 30 OmniboxView* CreateOmniboxView(OmniboxEditController* controller, |
| 31 ToolbarModel* toolbar_model, | 31 ToolbarModel* toolbar_model, |
| 32 Profile* profile, | 32 Profile* profile, |
| 33 CommandUpdater* command_updater, | 33 CommandUpdater* command_updater, |
| 34 bool popup_window_mode, | 34 bool popup_window_mode, |
| 35 LocationBarView* location_bar, | 35 LocationBarView* location_bar, |
| 36 const gfx::Font& font, | 36 const gfx::FontList& font_list, |
| 37 int font_y_offset) { | 37 int font_y_offset) { |
| 38 #if defined(OS_WIN) && !defined(USE_AURA) | 38 #if defined(OS_WIN) && !defined(USE_AURA) |
| 39 if (!views::Textfield::IsViewsTextfieldEnabled()) { | 39 if (!views::Textfield::IsViewsTextfieldEnabled()) { |
| 40 return new OmniboxViewWin( | 40 return new OmniboxViewWin( |
| 41 controller, toolbar_model, location_bar, command_updater, | 41 controller, toolbar_model, location_bar, command_updater, |
| 42 popup_window_mode, font, font_y_offset); | 42 popup_window_mode, font_list, font_y_offset); |
| 43 } | 43 } |
| 44 #endif | 44 #endif |
| 45 OmniboxViewViews* omnibox = new OmniboxViewViews( | 45 OmniboxViewViews* omnibox = new OmniboxViewViews( |
| 46 controller, toolbar_model, profile, command_updater, popup_window_mode, | 46 controller, toolbar_model, profile, command_updater, popup_window_mode, |
| 47 location_bar, font, font_y_offset); | 47 location_bar, font_list, font_y_offset); |
| 48 omnibox->Init(); | 48 omnibox->Init(); |
| 49 return omnibox; | 49 return omnibox; |
| 50 } | 50 } |
| OLD | NEW |