| 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 { NativeTheme::kColorId_ResultsTableHoveredDimmedText, | 68 { NativeTheme::kColorId_ResultsTableHoveredDimmedText, |
| 69 OmniboxResultView::HOVERED, OmniboxResultView::DIMMED_TEXT }, | 69 OmniboxResultView::HOVERED, OmniboxResultView::DIMMED_TEXT }, |
| 70 { NativeTheme::kColorId_ResultsTableSelectedDimmedText, | 70 { NativeTheme::kColorId_ResultsTableSelectedDimmedText, |
| 71 OmniboxResultView::SELECTED, OmniboxResultView::DIMMED_TEXT }, | 71 OmniboxResultView::SELECTED, OmniboxResultView::DIMMED_TEXT }, |
| 72 { NativeTheme::kColorId_ResultsTableNormalUrl, | 72 { NativeTheme::kColorId_ResultsTableNormalUrl, |
| 73 OmniboxResultView::NORMAL, OmniboxResultView::URL }, | 73 OmniboxResultView::NORMAL, OmniboxResultView::URL }, |
| 74 { NativeTheme::kColorId_ResultsTableHoveredUrl, | 74 { NativeTheme::kColorId_ResultsTableHoveredUrl, |
| 75 OmniboxResultView::HOVERED, OmniboxResultView::URL }, | 75 OmniboxResultView::HOVERED, OmniboxResultView::URL }, |
| 76 { NativeTheme::kColorId_ResultsTableSelectedUrl, | 76 { NativeTheme::kColorId_ResultsTableSelectedUrl, |
| 77 OmniboxResultView::SELECTED, OmniboxResultView::URL }, | 77 OmniboxResultView::SELECTED, OmniboxResultView::URL }, |
| 78 { NativeTheme::kColorId_ResultsTableNormalDivider, | |
| 79 OmniboxResultView::NORMAL, OmniboxResultView::DIVIDER }, | |
| 80 { NativeTheme::kColorId_ResultsTableHoveredDivider, | |
| 81 OmniboxResultView::HOVERED, OmniboxResultView::DIVIDER }, | |
| 82 { NativeTheme::kColorId_ResultsTableSelectedDivider, | |
| 83 OmniboxResultView::SELECTED, OmniboxResultView::DIVIDER }, | |
| 84 }; | 78 }; |
| 85 | 79 |
| 86 struct TextStyle { | 80 struct TextStyle { |
| 87 ui::ResourceBundle::FontStyle font; | 81 ui::ResourceBundle::FontStyle font; |
| 88 ui::NativeTheme::ColorId colors[OmniboxResultView::NUM_STATES]; | 82 ui::NativeTheme::ColorId colors[OmniboxResultView::NUM_STATES]; |
| 89 gfx::BaselineStyle baseline; | 83 gfx::BaselineStyle baseline; |
| 90 } const kTextStyles[] = { | 84 } const kTextStyles[] = { |
| 91 // 1 ANSWER_TEXT | 85 // 1 ANSWER_TEXT |
| 92 {ui::ResourceBundle::LargeFont, | 86 {ui::ResourceBundle::LargeFont, |
| 93 {NativeTheme::kColorId_ResultsTableNormalText, | 87 {NativeTheme::kColorId_ResultsTableNormalText, |
| (...skipping 730 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 824 | 818 |
| 825 int OmniboxResultView::StartMargin() const { | 819 int OmniboxResultView::StartMargin() const { |
| 826 return ui::MaterialDesignController::IsModeMaterial() ? | 820 return ui::MaterialDesignController::IsModeMaterial() ? |
| 827 model_->start_margin() : 0; | 821 model_->start_margin() : 0; |
| 828 } | 822 } |
| 829 | 823 |
| 830 int OmniboxResultView::EndMargin() const { | 824 int OmniboxResultView::EndMargin() const { |
| 831 return ui::MaterialDesignController::IsModeMaterial() ? | 825 return ui::MaterialDesignController::IsModeMaterial() ? |
| 832 model_->end_margin() : 0; | 826 model_->end_margin() : 0; |
| 833 } | 827 } |
| OLD | NEW |