| 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 15 matching lines...) Expand all Loading... |
| 26 #include "ui/base/theme_provider.h" | 26 #include "ui/base/theme_provider.h" |
| 27 #include "ui/gfx/canvas.h" | 27 #include "ui/gfx/canvas.h" |
| 28 #include "ui/gfx/color_utils.h" | 28 #include "ui/gfx/color_utils.h" |
| 29 #include "ui/gfx/image/image.h" | 29 #include "ui/gfx/image/image.h" |
| 30 #include "ui/gfx/range/range.h" | 30 #include "ui/gfx/range/range.h" |
| 31 #include "ui/gfx/render_text.h" | 31 #include "ui/gfx/render_text.h" |
| 32 #include "ui/gfx/text_elider.h" | 32 #include "ui/gfx/text_elider.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" |
| 35 | 35 |
| 36 #if defined(OS_WIN) | |
| 37 #include "ui/native_theme/native_theme_win.h" | |
| 38 #endif | |
| 39 | |
| 40 #if defined(USE_AURA) | |
| 41 #include "ui/native_theme/native_theme_aura.h" | |
| 42 #endif | |
| 43 | |
| 44 using ui::NativeTheme; | 36 using ui::NativeTheme; |
| 45 | 37 |
| 46 namespace { | 38 namespace { |
| 47 | 39 |
| 48 // The minimum distance between the top and bottom of the {icon|text} and the | 40 // The minimum distance between the top and bottom of the {icon|text} and the |
| 49 // top or bottom of the row. | 41 // top or bottom of the row. |
| 50 const int kMinimumIconVerticalPadding = 2; | 42 const int kMinimumIconVerticalPadding = 2; |
| 51 const int kMinimumTextVerticalPadding = 3; | 43 const int kMinimumTextVerticalPadding = 3; |
| 52 | 44 |
| 53 // A mapping from OmniboxResultView's ResultViewState/ColorKind types to | 45 // A mapping from OmniboxResultView's ResultViewState/ColorKind types to |
| (...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 563 } | 555 } |
| 564 PaintMatch(*keyword_match, keyword_contents_rendertext_.get(), | 556 PaintMatch(*keyword_match, keyword_contents_rendertext_.get(), |
| 565 keyword_description_rendertext_.get(), canvas, x); | 557 keyword_description_rendertext_.get(), canvas, x); |
| 566 } | 558 } |
| 567 } | 559 } |
| 568 | 560 |
| 569 void OmniboxResultView::AnimationProgressed(const gfx::Animation* animation) { | 561 void OmniboxResultView::AnimationProgressed(const gfx::Animation* animation) { |
| 570 Layout(); | 562 Layout(); |
| 571 SchedulePaint(); | 563 SchedulePaint(); |
| 572 } | 564 } |
| OLD | NEW |