| 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 "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| 11 #include "chrome/browser/autocomplete/autocomplete_match.h" | 11 #include "chrome/browser/autocomplete/autocomplete_match.h" |
| 12 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h" | 12 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h" |
| 13 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
| 14 #include "chrome/browser/search_engines/template_url.h" | 14 #include "chrome/browser/search_engines/template_url.h" |
| 15 #include "chrome/browser/search_engines/template_url_service.h" | 15 #include "chrome/browser/search_engines/template_url_service.h" |
| 16 #include "chrome/browser/search_engines/template_url_service_factory.h" | 16 #include "chrome/browser/search_engines/template_url_service_factory.h" |
| 17 #include "chrome/browser/ui/omnibox/omnibox_popup_model_observer.h" |
| 17 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h" | 18 #include "chrome/browser/ui/omnibox/omnibox_popup_view.h" |
| 18 #include "third_party/icu/public/common/unicode/ubidi.h" | 19 #include "third_party/icu/public/common/unicode/ubidi.h" |
| 19 #include "ui/gfx/image/image.h" | 20 #include "ui/gfx/image/image.h" |
| 20 #include "ui/gfx/rect.h" | 21 #include "ui/gfx/rect.h" |
| 21 | 22 |
| 22 /////////////////////////////////////////////////////////////////////////////// | 23 /////////////////////////////////////////////////////////////////////////////// |
| 23 // OmniboxPopupModel | 24 // OmniboxPopupModel |
| 24 | 25 |
| 25 const size_t OmniboxPopupModel::kNoMatch = -1; | 26 const size_t OmniboxPopupModel::kNoMatch = -1; |
| 26 | 27 |
| (...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 211 // There had better not be a nonempty result set with no default match. | 212 // There had better not be a nonempty result set with no default match. |
| 212 CHECK((selected_line_ != kNoMatch) || result.empty()); | 213 CHECK((selected_line_ != kNoMatch) || result.empty()); |
| 213 manually_selected_match_.Clear(); | 214 manually_selected_match_.Clear(); |
| 214 selected_line_state_ = NORMAL; | 215 selected_line_state_ = NORMAL; |
| 215 // If we're going to trim the window size to no longer include the hovered | 216 // If we're going to trim the window size to no longer include the hovered |
| 216 // line, turn hover off. Practically, this shouldn't happen, but it | 217 // line, turn hover off. Practically, this shouldn't happen, but it |
| 217 // doesn't hurt to be defensive. | 218 // doesn't hurt to be defensive. |
| 218 if ((hovered_line_ != kNoMatch) && (result.size() <= hovered_line_)) | 219 if ((hovered_line_ != kNoMatch) && (result.size() <= hovered_line_)) |
| 219 SetHoveredLine(kNoMatch); | 220 SetHoveredLine(kNoMatch); |
| 220 | 221 |
| 222 bool popup_was_open = view_->IsOpen(); |
| 221 view_->UpdatePopupAppearance(); | 223 view_->UpdatePopupAppearance(); |
| 224 // If popup has just been shown or hidden, notify observers. |
| 225 if (view_->IsOpen() != popup_was_open) { |
| 226 FOR_EACH_OBSERVER(OmniboxPopupModelObserver, observers_, |
| 227 OnOmniboxPopupShownOrHidden()); |
| 228 } |
| 222 } | 229 } |
| 230 |
| 231 void OmniboxPopupModel::AddObserver(OmniboxPopupModelObserver* observer) { |
| 232 observers_.AddObserver(observer); |
| 233 } |
| 234 |
| 235 void OmniboxPopupModel::RemoveObserver(OmniboxPopupModelObserver* observer) { |
| 236 observers_.RemoveObserver(observer); |
| 237 } |
| OLD | NEW |