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 "base/memory/scoped_vector.h" | 17 #include "base/memory/scoped_vector.h" |
18 #include "base/strings/string_number_conversions.h" | 18 #include "base/strings/string_number_conversions.h" |
19 #include "base/strings/string_util.h" | 19 #include "base/strings/string_util.h" |
20 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" | 20 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" |
21 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 21 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
22 #include "chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h" | 22 #include "chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h" |
| 23 #include "chrome/grit/generated_resources.h" |
23 #include "grit/component_scaled_resources.h" | 24 #include "grit/component_scaled_resources.h" |
24 #include "grit/generated_resources.h" | |
25 #include "grit/theme_resources.h" | 25 #include "grit/theme_resources.h" |
26 #include "ui/base/l10n/l10n_util.h" | 26 #include "ui/base/l10n/l10n_util.h" |
27 #include "ui/base/theme_provider.h" | 27 #include "ui/base/theme_provider.h" |
28 #include "ui/gfx/canvas.h" | 28 #include "ui/gfx/canvas.h" |
29 #include "ui/gfx/color_utils.h" | 29 #include "ui/gfx/color_utils.h" |
30 #include "ui/gfx/image/image.h" | 30 #include "ui/gfx/image/image.h" |
31 #include "ui/gfx/range/range.h" | 31 #include "ui/gfx/range/range.h" |
32 #include "ui/gfx/render_text.h" | 32 #include "ui/gfx/render_text.h" |
33 #include "ui/gfx/text_utils.h" | 33 #include "ui/gfx/text_utils.h" |
34 #include "ui/native_theme/native_theme.h" | 34 #include "ui/native_theme/native_theme.h" |
(...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
556 } | 556 } |
557 PaintMatch(*keyword_match, keyword_contents_rendertext_.get(), | 557 PaintMatch(*keyword_match, keyword_contents_rendertext_.get(), |
558 keyword_description_rendertext_.get(), canvas, x); | 558 keyword_description_rendertext_.get(), canvas, x); |
559 } | 559 } |
560 } | 560 } |
561 | 561 |
562 void OmniboxResultView::AnimationProgressed(const gfx::Animation* animation) { | 562 void OmniboxResultView::AnimationProgressed(const gfx::Animation* animation) { |
563 Layout(); | 563 Layout(); |
564 SchedulePaint(); | 564 SchedulePaint(); |
565 } | 565 } |
OLD | NEW |