| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/autocomplete/autocomplete_popup_model.h" | 5 #include "chrome/browser/autocomplete/autocomplete_popup_model.h" |
| 6 | 6 |
| 7 #include <algorithm> |
| 8 |
| 7 #include "unicode/ubidi.h" | 9 #include "unicode/ubidi.h" |
| 8 | 10 |
| 9 #include "base/string_util.h" | 11 #include "base/string_util.h" |
| 10 #include "chrome/browser/autocomplete/autocomplete_edit.h" | 12 #include "chrome/browser/autocomplete/autocomplete_edit.h" |
| 11 #include "chrome/browser/autocomplete/autocomplete_match.h" | 13 #include "chrome/browser/autocomplete/autocomplete_match.h" |
| 12 #include "chrome/browser/autocomplete/autocomplete_popup_view.h" | 14 #include "chrome/browser/autocomplete/autocomplete_popup_view.h" |
| 13 #include "chrome/browser/autocomplete/search_provider.h" | 15 #include "chrome/browser/autocomplete/search_provider.h" |
| 16 #include "chrome/browser/extensions/extension_service.h" |
| 14 #include "chrome/browser/profiles/profile.h" | 17 #include "chrome/browser/profiles/profile.h" |
| 15 #include "chrome/browser/extensions/extension_service.h" | |
| 16 #include "chrome/browser/search_engines/template_url.h" | 18 #include "chrome/browser/search_engines/template_url.h" |
| 17 #include "chrome/browser/search_engines/template_url_model.h" | 19 #include "chrome/browser/search_engines/template_url_model.h" |
| 18 #include "chrome/common/notification_service.h" | 20 #include "chrome/common/notification_details.h" |
| 21 #include "chrome/common/notification_source.h" |
| 19 #include "gfx/rect.h" | 22 #include "gfx/rect.h" |
| 20 | 23 |
| 21 /////////////////////////////////////////////////////////////////////////////// | 24 /////////////////////////////////////////////////////////////////////////////// |
| 22 // AutocompletePopupModel | 25 // AutocompletePopupModel |
| 23 | 26 |
| 24 AutocompletePopupModel::AutocompletePopupModel( | 27 AutocompletePopupModel::AutocompletePopupModel( |
| 25 AutocompletePopupView* popup_view, | 28 AutocompletePopupView* popup_view, |
| 26 AutocompleteEditModel* edit_model, | 29 AutocompleteEditModel* edit_model, |
| 27 Profile* profile) | 30 Profile* profile) |
| 28 : view_(popup_view), | 31 : view_(popup_view), |
| (...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 318 } | 321 } |
| 319 | 322 |
| 320 const SkBitmap* AutocompletePopupModel::GetSpecialIconForMatch( | 323 const SkBitmap* AutocompletePopupModel::GetSpecialIconForMatch( |
| 321 const AutocompleteMatch& match) const { | 324 const AutocompleteMatch& match) const { |
| 322 if (!match.template_url || !match.template_url->IsExtensionKeyword()) | 325 if (!match.template_url || !match.template_url->IsExtensionKeyword()) |
| 323 return NULL; | 326 return NULL; |
| 324 | 327 |
| 325 return &profile_->GetExtensionService()->GetOmniboxPopupIcon( | 328 return &profile_->GetExtensionService()->GetOmniboxPopupIcon( |
| 326 match.template_url->GetExtensionId()); | 329 match.template_url->GetExtensionId()); |
| 327 } | 330 } |
| OLD | NEW |