| 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 22 matching lines...) Expand all Loading... |
| 33 #if defined(OS_WIN) | 33 #if defined(OS_WIN) |
| 34 #include "ui/native_theme/native_theme_win.h" | 34 #include "ui/native_theme/native_theme_win.h" |
| 35 #endif | 35 #endif |
| 36 | 36 |
| 37 #if defined(USE_AURA) | 37 #if defined(USE_AURA) |
| 38 #include "ui/native_theme/native_theme_aura.h" | 38 #include "ui/native_theme/native_theme_aura.h" |
| 39 #endif | 39 #endif |
| 40 | 40 |
| 41 namespace { | 41 namespace { |
| 42 | 42 |
| 43 const char16 kEllipsis[] = { 0x2026, 0x0 }; | 43 const base::char16 kEllipsis[] = { 0x2026, 0x0 }; |
| 44 | 44 |
| 45 // The minimum distance between the top and bottom of the {icon|text} and the | 45 // The minimum distance between the top and bottom of the {icon|text} and the |
| 46 // top or bottom of the row. | 46 // top or bottom of the row. |
| 47 const int kMinimumIconVerticalPadding = 2; | 47 const int kMinimumIconVerticalPadding = 2; |
| 48 const int kMinimumTextVerticalPadding = 3; | 48 const int kMinimumTextVerticalPadding = 3; |
| 49 | 49 |
| 50 } // namespace | 50 } // namespace |
| 51 | 51 |
| 52 //////////////////////////////////////////////////////////////////////////////// | 52 //////////////////////////////////////////////////////////////////////////////// |
| 53 // OmniboxResultView, public: | 53 // OmniboxResultView, public: |
| (...skipping 572 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 626 int x = GetMirroredXForRect(keyword_text_bounds_); | 626 int x = GetMirroredXForRect(keyword_text_bounds_); |
| 627 mirroring_context_->Initialize(x, keyword_text_bounds_.width()); | 627 mirroring_context_->Initialize(x, keyword_text_bounds_.width()); |
| 628 PaintMatch(canvas, *match_.associated_keyword.get(), x); | 628 PaintMatch(canvas, *match_.associated_keyword.get(), x); |
| 629 } | 629 } |
| 630 } | 630 } |
| 631 | 631 |
| 632 void OmniboxResultView::AnimationProgressed(const gfx::Animation* animation) { | 632 void OmniboxResultView::AnimationProgressed(const gfx::Animation* animation) { |
| 633 Layout(); | 633 Layout(); |
| 634 SchedulePaint(); | 634 SchedulePaint(); |
| 635 } | 635 } |
| OLD | NEW |