| 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 19 matching lines...) Expand all Loading... |
| 30 Profile* profile, | 30 Profile* profile, |
| 31 CommandUpdater* command_updater, | 31 CommandUpdater* command_updater, |
| 32 bool popup_window_mode, | 32 bool popup_window_mode, |
| 33 LocationBarView* location_bar, | 33 LocationBarView* location_bar, |
| 34 const gfx::Font& font, | 34 const gfx::Font& font, |
| 35 int font_y_offset) { | 35 int font_y_offset) { |
| 36 #if defined(OS_WIN) && !defined(USE_AURA) | 36 #if defined(OS_WIN) && !defined(USE_AURA) |
| 37 if (!views::Textfield::IsViewsTextfieldEnabled()) { | 37 if (!views::Textfield::IsViewsTextfieldEnabled()) { |
| 38 return new OmniboxViewWin( | 38 return new OmniboxViewWin( |
| 39 controller, toolbar_model, location_bar, command_updater, | 39 controller, toolbar_model, location_bar, command_updater, |
| 40 popup_window_mode, location_bar, font, font_y_offset); | 40 popup_window_mode, font, font_y_offset); |
| 41 } | 41 } |
| 42 #endif | 42 #endif |
| 43 OmniboxViewViews* omnibox = new OmniboxViewViews( | 43 OmniboxViewViews* omnibox = new OmniboxViewViews( |
| 44 controller, toolbar_model, profile, command_updater, popup_window_mode, | 44 controller, toolbar_model, profile, command_updater, popup_window_mode, |
| 45 location_bar, font, font_y_offset); | 45 location_bar, font, font_y_offset); |
| 46 omnibox->Init(); | 46 omnibox->Init(); |
| 47 return omnibox; | 47 return omnibox; |
| 48 } | 48 } |
| OLD | NEW |