| 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/views/autocomplete/autocomplete_popup_contents_view.h" | 5 #include "chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h" |
| 6 | 6 |
| 7 #include "app/bidi_line_iterator.h" | 7 #include "app/bidi_line_iterator.h" |
| 8 #include "app/l10n_util.h" | 8 #include "app/l10n_util.h" |
| 9 #include "app/resource_bundle.h" | 9 #include "app/resource_bundle.h" |
| 10 #include "app/theme_provider.h" | 10 #include "app/theme_provider.h" |
| (...skipping 921 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 932 size_t index) const { | 932 size_t index) const { |
| 933 if (!HasMatchAt(index)) | 933 if (!HasMatchAt(index)) |
| 934 return NULL; | 934 return NULL; |
| 935 return model_->GetSpecialIconForMatch(GetMatchAtIndex(index)); | 935 return model_->GetSpecialIconForMatch(GetMatchAtIndex(index)); |
| 936 } | 936 } |
| 937 | 937 |
| 938 //////////////////////////////////////////////////////////////////////////////// | 938 //////////////////////////////////////////////////////////////////////////////// |
| 939 // AutocompletePopupContentsView, AnimationDelegate implementation: | 939 // AutocompletePopupContentsView, AnimationDelegate implementation: |
| 940 | 940 |
| 941 void AutocompletePopupContentsView::AnimationProgressed( | 941 void AutocompletePopupContentsView::AnimationProgressed( |
| 942 const Animation* animation) { | 942 const ui::Animation* animation) { |
| 943 // We should only be running the animation when the popup is already visible. | 943 // We should only be running the animation when the popup is already visible. |
| 944 DCHECK(popup_ != NULL); | 944 DCHECK(popup_ != NULL); |
| 945 popup_->SetBounds(GetPopupBounds()); | 945 popup_->SetBounds(GetPopupBounds()); |
| 946 } | 946 } |
| 947 | 947 |
| 948 //////////////////////////////////////////////////////////////////////////////// | 948 //////////////////////////////////////////////////////////////////////////////// |
| 949 // AutocompletePopupContentsView, views::View overrides: | 949 // AutocompletePopupContentsView, views::View overrides: |
| 950 | 950 |
| 951 void AutocompletePopupContentsView::Paint(gfx::Canvas* canvas) { | 951 void AutocompletePopupContentsView::Paint(gfx::Canvas* canvas) { |
| 952 // We paint our children in an unconventional way. | 952 // We paint our children in an unconventional way. |
| (...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1204 opt_in_view_ = NULL; | 1204 opt_in_view_ = NULL; |
| 1205 PromoCounter* counter = model_->profile()->GetInstantPromoCounter(); | 1205 PromoCounter* counter = model_->profile()->GetInstantPromoCounter(); |
| 1206 DCHECK(counter); | 1206 DCHECK(counter); |
| 1207 counter->Hide(); | 1207 counter->Hide(); |
| 1208 if (opt_in) { | 1208 if (opt_in) { |
| 1209 browser::ShowInstantConfirmDialogIfNecessary( | 1209 browser::ShowInstantConfirmDialogIfNecessary( |
| 1210 location_bar_->GetWindow()->GetNativeWindow(), model_->profile()); | 1210 location_bar_->GetWindow()->GetNativeWindow(), model_->profile()); |
| 1211 } | 1211 } |
| 1212 UpdatePopupAppearance(); | 1212 UpdatePopupAppearance(); |
| 1213 } | 1213 } |
| OLD | NEW |