| 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 #include "ui/base/native_theme/native_theme_aura.h" | 5 #include "ui/base/native_theme/native_theme_aura.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "grit/ui_resources.h" | 8 #include "grit/ui_resources.h" |
| 9 #include "ui/base/layout.h" | 9 #include "ui/base/layout.h" |
| 10 #include "ui/base/resource/resource_bundle.h" | 10 #include "ui/base/resource/resource_bundle.h" |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 100 return kTextButtonHoverColor; | 100 return kTextButtonHoverColor; |
| 101 | 101 |
| 102 // MenuItem | 102 // MenuItem |
| 103 case kColorId_EnabledMenuItemForegroundColor: | 103 case kColorId_EnabledMenuItemForegroundColor: |
| 104 return kEnabledMenuItemForegroundColor; | 104 return kEnabledMenuItemForegroundColor; |
| 105 case kColorId_DisabledMenuItemForegroundColor: | 105 case kColorId_DisabledMenuItemForegroundColor: |
| 106 return kDisabledMenuItemForegroundColor; | 106 return kDisabledMenuItemForegroundColor; |
| 107 case kColorId_FocusedMenuItemBackgroundColor: | 107 case kColorId_FocusedMenuItemBackgroundColor: |
| 108 return kFocusedMenuItemBackgroundColor; | 108 return kFocusedMenuItemBackgroundColor; |
| 109 case kColorId_MenuSeparatorColor: | 109 case kColorId_MenuSeparatorColor: |
| 110 #if defined(USE_AURA) |
| 111 return kMenuSeparatorColorTouch; |
| 112 #else |
| 110 return ui::GetDisplayLayout() == ui::LAYOUT_TOUCH ? | 113 return ui::GetDisplayLayout() == ui::LAYOUT_TOUCH ? |
| 111 kMenuSeparatorColorTouch : kMenuSeparatorColor; | 114 kMenuSeparatorColorTouch : kMenuSeparatorColor; |
| 115 #endif |
| 112 | 116 |
| 113 // Label | 117 // Label |
| 114 case kColorId_LabelEnabledColor: | 118 case kColorId_LabelEnabledColor: |
| 115 return kLabelEnabledColor; | 119 return kLabelEnabledColor; |
| 116 case kColorId_LabelDisabledColor: | 120 case kColorId_LabelDisabledColor: |
| 117 return kLabelDisabledColor; | 121 return kLabelDisabledColor; |
| 118 case kColorId_LabelBackgroundColor: | 122 case kColorId_LabelBackgroundColor: |
| 119 return kLabelBackgroundColor; | 123 return kLabelBackgroundColor; |
| 120 | 124 |
| 121 // Textfield | 125 // Textfield |
| (...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 297 DrawTiledImage(canvas, *center, | 301 DrawTiledImage(canvas, *center, |
| 298 0, 0, 1.0, 1.0, | 302 0, 0, 1.0, 1.0, |
| 299 rect.x() + left->width(), rect.y(), | 303 rect.x() + left->width(), rect.y(), |
| 300 rect.width() - left->width() - right->width(), | 304 rect.width() - left->width() - right->width(), |
| 301 center->height()); | 305 center->height()); |
| 302 } | 306 } |
| 303 } | 307 } |
| 304 } | 308 } |
| 305 | 309 |
| 306 } // namespace ui | 310 } // namespace ui |
| OLD | NEW |