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_views.h" | 5 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" |
6 | 6 |
7 #include "base/property_bag.h" | 7 #include "base/property_bag.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
(...skipping 846 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
857 } | 857 } |
858 | 858 |
859 #if defined(USE_AURA) | 859 #if defined(USE_AURA) |
860 // static | 860 // static |
861 OmniboxView* OmniboxView::CreateOmniboxView( | 861 OmniboxView* OmniboxView::CreateOmniboxView( |
862 AutocompleteEditController* controller, | 862 AutocompleteEditController* controller, |
863 ToolbarModel* toolbar_model, | 863 ToolbarModel* toolbar_model, |
864 Profile* profile, | 864 Profile* profile, |
865 CommandUpdater* command_updater, | 865 CommandUpdater* command_updater, |
866 bool popup_window_mode, | 866 bool popup_window_mode, |
| 867 int height, |
867 LocationBarView* location_bar) { | 868 LocationBarView* location_bar) { |
868 OmniboxViewViews* omnibox_view = new OmniboxViewViews(controller, | 869 OmniboxViewViews* omnibox_view = new OmniboxViewViews(controller, |
869 toolbar_model, | 870 toolbar_model, |
870 profile, | 871 profile, |
871 command_updater, | 872 command_updater, |
872 popup_window_mode, | 873 popup_window_mode, |
873 location_bar); | 874 location_bar); |
874 omnibox_view->Init(); | 875 omnibox_view->Init(); |
875 return omnibox_view; | 876 return omnibox_view; |
876 } | 877 } |
877 #endif | 878 #endif |
OLD | NEW |