| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "components/omnibox/browser/omnibox_controller.h" | 5 #include "components/omnibox/browser/omnibox_controller.h" |
| 6 | 6 |
| 7 #include "base/metrics/histogram.h" | 7 #include "base/metrics/histogram.h" |
| 8 #include "components/omnibox/browser/autocomplete_classifier.h" | 8 #include "components/omnibox/browser/autocomplete_classifier.h" |
| 9 #include "components/omnibox/browser/autocomplete_match.h" | 9 #include "components/omnibox/browser/autocomplete_match.h" |
| 10 #include "components/omnibox/browser/omnibox_client.h" | 10 #include "components/omnibox/browser/omnibox_client.h" |
| 11 #include "components/omnibox/browser/omnibox_edit_controller.h" | 11 #include "components/omnibox/browser/omnibox_edit_controller.h" |
| 12 #include "components/omnibox/browser/omnibox_edit_model.h" | 12 #include "components/omnibox/browser/omnibox_edit_model.h" |
| 13 #include "components/omnibox/browser/omnibox_popup_model.h" | 13 #include "components/omnibox/browser/omnibox_popup_model.h" |
| 14 #include "components/omnibox/browser/omnibox_popup_view.h" | 14 #include "components/omnibox/browser/omnibox_popup_view.h" |
| 15 #include "components/search/search.h" | |
| 16 #include "ui/gfx/geometry/rect.h" | 15 #include "ui/gfx/geometry/rect.h" |
| 17 | 16 |
| 18 OmniboxController::OmniboxController(OmniboxEditModel* omnibox_edit_model, | 17 OmniboxController::OmniboxController(OmniboxEditModel* omnibox_edit_model, |
| 19 OmniboxClient* client) | 18 OmniboxClient* client) |
| 20 : omnibox_edit_model_(omnibox_edit_model), | 19 : omnibox_edit_model_(omnibox_edit_model), |
| 21 client_(client), | 20 client_(client), |
| 22 popup_(nullptr), | 21 popup_(nullptr), |
| 23 autocomplete_controller_(new AutocompleteController( | 22 autocomplete_controller_(new AutocompleteController( |
| 24 client_->CreateAutocompleteProviderClient(), | 23 client_->CreateAutocompleteProviderClient(), |
| 25 this, | 24 this, |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 78 | 77 |
| 79 void OmniboxController::ClearPopupKeywordMode() const { | 78 void OmniboxController::ClearPopupKeywordMode() const { |
| 80 if (popup_->IsOpen() && | 79 if (popup_->IsOpen() && |
| 81 popup_->selected_line_state() == OmniboxPopupModel::KEYWORD) | 80 popup_->selected_line_state() == OmniboxPopupModel::KEYWORD) |
| 82 popup_->SetSelectedLineState(OmniboxPopupModel::NORMAL); | 81 popup_->SetSelectedLineState(OmniboxPopupModel::NORMAL); |
| 83 } | 82 } |
| 84 | 83 |
| 85 void OmniboxController::SetAnswerBitmap(const SkBitmap& bitmap) { | 84 void OmniboxController::SetAnswerBitmap(const SkBitmap& bitmap) { |
| 86 popup_->SetAnswerBitmap(bitmap); | 85 popup_->SetAnswerBitmap(bitmap); |
| 87 } | 86 } |
| OLD | NEW |