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 |
11 | 11 |
12 #include "chrome/browser/ui/views/omnibox/omnibox_result_view.h" | 12 #include "chrome/browser/ui/views/omnibox/omnibox_result_view.h" |
13 | 13 |
14 #include <algorithm> // NOLINT | 14 #include <algorithm> // NOLINT |
15 | 15 |
16 #include "base/i18n/bidi_line_iterator.h" | 16 #include "base/i18n/bidi_line_iterator.h" |
17 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" | 17 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" |
18 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 18 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
19 #include "chrome/browser/ui/views/omnibox/omnibox_result_view_model.h" | 19 #include "chrome/browser/ui/views/omnibox/omnibox_result_view_model.h" |
20 #include "grit/generated_resources.h" | 20 #include "grit/generated_resources.h" |
21 #include "grit/theme_resources.h" | 21 #include "grit/theme_resources.h" |
| 22 #include "grit/theme_resources_standard.h" |
22 #include "ui/base/l10n/l10n_util.h" | 23 #include "ui/base/l10n/l10n_util.h" |
23 #include "ui/base/native_theme/native_theme.h" | 24 #include "ui/base/native_theme/native_theme.h" |
24 #include "ui/base/resource/resource_bundle.h" | 25 #include "ui/base/resource/resource_bundle.h" |
25 #include "ui/base/text/text_elider.h" | 26 #include "ui/base/text/text_elider.h" |
26 #include "ui/gfx/canvas.h" | 27 #include "ui/gfx/canvas.h" |
27 #include "ui/gfx/color_utils.h" | 28 #include "ui/gfx/color_utils.h" |
28 | 29 |
29 namespace { | 30 namespace { |
30 | 31 |
31 const char16 kEllipsis[] = { 0x2026, 0x0 }; | 32 const char16 kEllipsis[] = { 0x2026, 0x0 }; |
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
625 int x = GetMirroredXForRect(keyword_text_bounds_); | 626 int x = GetMirroredXForRect(keyword_text_bounds_); |
626 mirroring_context_->Initialize(x, keyword_text_bounds_.width()); | 627 mirroring_context_->Initialize(x, keyword_text_bounds_.width()); |
627 PaintMatch(canvas, *match_.associated_keyword.get(), x); | 628 PaintMatch(canvas, *match_.associated_keyword.get(), x); |
628 } | 629 } |
629 } | 630 } |
630 | 631 |
631 void OmniboxResultView::AnimationProgressed(const ui::Animation* animation) { | 632 void OmniboxResultView::AnimationProgressed(const ui::Animation* animation) { |
632 Layout(); | 633 Layout(); |
633 SchedulePaint(); | 634 SchedulePaint(); |
634 } | 635 } |
OLD | NEW |