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 417 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
428 | 428 |
429 } // namespace | 429 } // namespace |
430 | 430 |
431 OmniboxViewWin::OmniboxViewWin(AutocompleteEditController* controller, | 431 OmniboxViewWin::OmniboxViewWin(AutocompleteEditController* controller, |
432 ToolbarModel* toolbar_model, | 432 ToolbarModel* toolbar_model, |
433 LocationBarView* parent_view, | 433 LocationBarView* parent_view, |
434 CommandUpdater* command_updater, | 434 CommandUpdater* command_updater, |
435 bool popup_window_mode, | 435 bool popup_window_mode, |
436 views::View* location_bar) | 436 views::View* location_bar) |
437 : model_(new AutocompleteEditModel(this, controller, | 437 : model_(new AutocompleteEditModel(this, controller, |
438 parent_view->profile())), | 438 parent_view->browser()->profile())), |
439 popup_view_(new AutocompletePopupContentsView(parent_view->font(), this, | 439 popup_view_(new AutocompletePopupContentsView(parent_view->font(), this, |
440 model_.get(), | 440 model_.get(), |
441 location_bar)), | 441 location_bar)), |
442 controller_(controller), | 442 controller_(controller), |
443 parent_view_(parent_view), | 443 parent_view_(parent_view), |
444 toolbar_model_(toolbar_model), | 444 toolbar_model_(toolbar_model), |
445 command_updater_(command_updater), | 445 command_updater_(command_updater), |
446 popup_window_mode_(popup_window_mode), | 446 popup_window_mode_(popup_window_mode), |
447 force_hidden_(false), | 447 force_hidden_(false), |
448 tracking_click_(), | 448 tracking_click_(), |
(...skipping 2273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2722 return omnibox_view; | 2722 return omnibox_view; |
2723 } | 2723 } |
2724 return new OmniboxViewWin(controller, | 2724 return new OmniboxViewWin(controller, |
2725 toolbar_model, | 2725 toolbar_model, |
2726 location_bar, | 2726 location_bar, |
2727 command_updater, | 2727 command_updater, |
2728 popup_window_mode, | 2728 popup_window_mode, |
2729 location_bar); | 2729 location_bar); |
2730 } | 2730 } |
2731 #endif | 2731 #endif |
OLD | NEW |