| 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/omnibox/omnibox_popup_model.h" | 5 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "unicode/ubidi.h" | |
| 10 | |
| 11 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 12 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| 13 #include "chrome/browser/autocomplete/autocomplete_match.h" | 11 #include "chrome/browser/autocomplete/autocomplete_match.h" |
| 14 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h" | 12 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h" |
| 15 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
| 16 #include "chrome/browser/search_engines/template_url.h" | 14 #include "chrome/browser/search_engines/template_url.h" |
| 17 #include "chrome/browser/search_engines/template_url_service.h" | 15 #include "chrome/browser/search_engines/template_url_service.h" |
| 18 #include "chrome/browser/search_engines/template_url_service_factory.h" | 16 #include "chrome/browser/search_engines/template_url_service_factory.h" |
| 19 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h" | 17 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h" |
| 18 #include "third_party/icu/public/common/unicode/ubidi.h" |
| 20 #include "ui/gfx/image/image.h" | 19 #include "ui/gfx/image/image.h" |
| 21 #include "ui/gfx/rect.h" | 20 #include "ui/gfx/rect.h" |
| 22 | 21 |
| 23 /////////////////////////////////////////////////////////////////////////////// | 22 /////////////////////////////////////////////////////////////////////////////// |
| 24 // OmniboxPopupModel | 23 // OmniboxPopupModel |
| 25 | 24 |
| 26 const size_t OmniboxPopupModel::kNoMatch = -1; | 25 const size_t OmniboxPopupModel::kNoMatch = -1; |
| 27 | 26 |
| 28 OmniboxPopupModel::OmniboxPopupModel( | 27 OmniboxPopupModel::OmniboxPopupModel( |
| 29 OmniboxPopupView* popup_view, | 28 OmniboxPopupView* popup_view, |
| (...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 214 manually_selected_match_.Clear(); | 213 manually_selected_match_.Clear(); |
| 215 selected_line_state_ = NORMAL; | 214 selected_line_state_ = NORMAL; |
| 216 // If we're going to trim the window size to no longer include the hovered | 215 // If we're going to trim the window size to no longer include the hovered |
| 217 // line, turn hover off. Practically, this shouldn't happen, but it | 216 // line, turn hover off. Practically, this shouldn't happen, but it |
| 218 // doesn't hurt to be defensive. | 217 // doesn't hurt to be defensive. |
| 219 if ((hovered_line_ != kNoMatch) && (result.size() <= hovered_line_)) | 218 if ((hovered_line_ != kNoMatch) && (result.size() <= hovered_line_)) |
| 220 SetHoveredLine(kNoMatch); | 219 SetHoveredLine(kNoMatch); |
| 221 | 220 |
| 222 view_->UpdatePopupAppearance(); | 221 view_->UpdatePopupAppearance(); |
| 223 } | 222 } |
| OLD | NEW |