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_view_win.h" | 5 #include "chrome/browser/ui/views/omnibox/omnibox_view_win.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <locale> | 8 #include <locale> |
9 #include <string> | 9 #include <string> |
10 | 10 |
(...skipping 2694 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2705 | 2705 |
2706 #if !defined(USE_AURA) | 2706 #if !defined(USE_AURA) |
2707 // static | 2707 // static |
2708 OmniboxView* OmniboxView::CreateOmniboxView( | 2708 OmniboxView* OmniboxView::CreateOmniboxView( |
2709 AutocompleteEditController* controller, | 2709 AutocompleteEditController* controller, |
2710 ToolbarModel* toolbar_model, | 2710 ToolbarModel* toolbar_model, |
2711 Profile* profile, | 2711 Profile* profile, |
2712 CommandUpdater* command_updater, | 2712 CommandUpdater* command_updater, |
2713 bool popup_window_mode, | 2713 bool popup_window_mode, |
2714 LocationBarView* location_bar) { | 2714 LocationBarView* location_bar) { |
2715 if (views::Widget::IsPureViews()) { | |
2716 OmniboxViewViews* omnibox_view = new OmniboxViewViews(controller, | |
2717 toolbar_model, | |
2718 profile, | |
2719 command_updater, | |
2720 popup_window_mode, | |
2721 location_bar); | |
2722 omnibox_view->Init(); | |
2723 return omnibox_view; | |
2724 } | |
2725 return new OmniboxViewWin(controller, | 2715 return new OmniboxViewWin(controller, |
2726 toolbar_model, | 2716 toolbar_model, |
2727 location_bar, | 2717 location_bar, |
2728 command_updater, | 2718 command_updater, |
2729 popup_window_mode, | 2719 popup_window_mode, |
2730 location_bar); | 2720 location_bar); |
2731 } | 2721 } |
2732 #endif | 2722 #endif |
OLD | NEW |