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 // For WinDDK ATL compatibility, these ATL headers must come first. | 5 // For WinDDK ATL compatibility, these ATL headers must come first. |
6 #include "build/build_config.h" | 6 #include "build/build_config.h" |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <atlbase.h> // NOLINT | 8 #include <atlbase.h> // NOLINT |
9 #include <atlwin.h> // NOLINT | 9 #include <atlwin.h> // NOLINT |
10 #endif | 10 #endif |
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
284 int icon = match_.starred ? | 284 int icon = match_.starred ? |
285 IDR_OMNIBOX_STAR : AutocompleteMatch::TypeToIcon(match_.type); | 285 IDR_OMNIBOX_STAR : AutocompleteMatch::TypeToIcon(match_.type); |
286 if (GetState() == SELECTED) { | 286 if (GetState() == SELECTED) { |
287 switch (icon) { | 287 switch (icon) { |
288 case IDR_OMNIBOX_EXTENSION_APP: | 288 case IDR_OMNIBOX_EXTENSION_APP: |
289 icon = IDR_OMNIBOX_EXTENSION_APP_SELECTED; | 289 icon = IDR_OMNIBOX_EXTENSION_APP_SELECTED; |
290 break; | 290 break; |
291 case IDR_OMNIBOX_HTTP: | 291 case IDR_OMNIBOX_HTTP: |
292 icon = IDR_OMNIBOX_HTTP_SELECTED; | 292 icon = IDR_OMNIBOX_HTTP_SELECTED; |
293 break; | 293 break; |
294 case IDR_OMNIBOX_HISTORY: | |
295 icon = IDR_OMNIBOX_HISTORY_SELECTED; | |
296 break; | |
297 case IDR_OMNIBOX_SEARCH: | 294 case IDR_OMNIBOX_SEARCH: |
298 icon = IDR_OMNIBOX_SEARCH_SELECTED; | 295 icon = IDR_OMNIBOX_SEARCH_SELECTED; |
299 break; | 296 break; |
300 case IDR_OMNIBOX_STAR: | 297 case IDR_OMNIBOX_STAR: |
301 icon = IDR_OMNIBOX_STAR_SELECTED; | 298 icon = IDR_OMNIBOX_STAR_SELECTED; |
302 break; | 299 break; |
303 default: | 300 default: |
304 NOTREACHED(); | 301 NOTREACHED(); |
305 break; | 302 break; |
306 } | 303 } |
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
632 mirroring_context_->Initialize(x, keyword_text_bounds_.width()); | 629 mirroring_context_->Initialize(x, keyword_text_bounds_.width()); |
633 PaintMatch(canvas, *match_.associated_keyword.get(), x); | 630 PaintMatch(canvas, *match_.associated_keyword.get(), x); |
634 } | 631 } |
635 } | 632 } |
636 | 633 |
637 void AutocompleteResultView::AnimationProgressed( | 634 void AutocompleteResultView::AnimationProgressed( |
638 const ui::Animation* animation) { | 635 const ui::Animation* animation) { |
639 Layout(); | 636 Layout(); |
640 SchedulePaint(); | 637 SchedulePaint(); |
641 } | 638 } |
OLD | NEW |