| 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 419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 430 } // namespace | 430 } // namespace |
| 431 | 431 |
| 432 OmniboxViewWin::OmniboxViewWin(AutocompleteEditController* controller, | 432 OmniboxViewWin::OmniboxViewWin(AutocompleteEditController* controller, |
| 433 ToolbarModel* toolbar_model, | 433 ToolbarModel* toolbar_model, |
| 434 LocationBarView* parent_view, | 434 LocationBarView* parent_view, |
| 435 CommandUpdater* command_updater, | 435 CommandUpdater* command_updater, |
| 436 bool popup_window_mode, | 436 bool popup_window_mode, |
| 437 views::View* location_bar) | 437 views::View* location_bar) |
| 438 : model_(new AutocompleteEditModel(this, controller, | 438 : model_(new AutocompleteEditModel(this, controller, |
| 439 parent_view->profile())), | 439 parent_view->profile())), |
| 440 popup_view_(new AutocompletePopupContentsView(parent_view->font(), this, | 440 popup_view_(AutocompletePopupContentsView::CreateForEnvironment( |
| 441 model_.get(), | 441 parent_view->font(), this, model_.get(), location_bar)), |
| 442 location_bar)), | |
| 443 controller_(controller), | 442 controller_(controller), |
| 444 parent_view_(parent_view), | 443 parent_view_(parent_view), |
| 445 toolbar_model_(toolbar_model), | 444 toolbar_model_(toolbar_model), |
| 446 command_updater_(command_updater), | 445 command_updater_(command_updater), |
| 447 popup_window_mode_(popup_window_mode), | 446 popup_window_mode_(popup_window_mode), |
| 448 force_hidden_(false), | 447 force_hidden_(false), |
| 449 tracking_click_(), | 448 tracking_click_(), |
| 450 tracking_double_click_(false), | 449 tracking_double_click_(false), |
| 451 double_click_time_(0), | 450 double_click_time_(0), |
| 452 can_discard_mousemove_(false), | 451 can_discard_mousemove_(false), |
| (...skipping 2260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2713 bool popup_window_mode, | 2712 bool popup_window_mode, |
| 2714 LocationBarView* location_bar) { | 2713 LocationBarView* location_bar) { |
| 2715 return new OmniboxViewWin(controller, | 2714 return new OmniboxViewWin(controller, |
| 2716 toolbar_model, | 2715 toolbar_model, |
| 2717 location_bar, | 2716 location_bar, |
| 2718 command_updater, | 2717 command_updater, |
| 2719 popup_window_mode, | 2718 popup_window_mode, |
| 2720 location_bar); | 2719 location_bar); |
| 2721 } | 2720 } |
| 2722 #endif | 2721 #endif |
| OLD | NEW |