Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(151)

Side by Side Diff: ui/native_theme/native_theme_win.cc

Issue 2694323003: Reuse submenu arrow images for trees (like the edit bookmark tree). (Closed)
Patch Set: remove TreeArrow color Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ui/native_theme/native_theme_mac.mm ('k') | ui/views/controls/tree/tree_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/native_theme/native_theme_win.h" 5 #include "ui/native_theme/native_theme_win.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <uxtheme.h> 9 #include <uxtheme.h>
10 #include <vsstyle.h> 10 #include <vsstyle.h>
(...skipping 560 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 return system_colors_[COLOR_WINDOWTEXT]; 571 return system_colors_[COLOR_WINDOWTEXT];
572 case kColorId_TreeSelectedText: 572 case kColorId_TreeSelectedText:
573 return system_colors_[COLOR_HIGHLIGHTTEXT]; 573 return system_colors_[COLOR_HIGHLIGHTTEXT];
574 case kColorId_TreeSelectedTextUnfocused: 574 case kColorId_TreeSelectedTextUnfocused:
575 return system_colors_[COLOR_BTNTEXT]; 575 return system_colors_[COLOR_BTNTEXT];
576 case kColorId_TreeSelectionBackgroundFocused: 576 case kColorId_TreeSelectionBackgroundFocused:
577 return system_colors_[COLOR_HIGHLIGHT]; 577 return system_colors_[COLOR_HIGHLIGHT];
578 case kColorId_TreeSelectionBackgroundUnfocused: 578 case kColorId_TreeSelectionBackgroundUnfocused:
579 return system_colors_[IsUsingHighContrastTheme() ? 579 return system_colors_[IsUsingHighContrastTheme() ?
580 COLOR_MENUHIGHLIGHT : COLOR_BTNFACE]; 580 COLOR_MENUHIGHLIGHT : COLOR_BTNFACE];
581 case kColorId_TreeArrow:
582 return system_colors_[COLOR_WINDOWTEXT];
583 581
584 // Table 582 // Table
585 case kColorId_TableBackground: 583 case kColorId_TableBackground:
586 return system_colors_[COLOR_WINDOW]; 584 return system_colors_[COLOR_WINDOW];
587 case kColorId_TableText: 585 case kColorId_TableText:
588 return system_colors_[COLOR_WINDOWTEXT]; 586 return system_colors_[COLOR_WINDOWTEXT];
589 case kColorId_TableSelectedText: 587 case kColorId_TableSelectedText:
590 return system_colors_[COLOR_HIGHLIGHTTEXT]; 588 return system_colors_[COLOR_HIGHLIGHTTEXT];
591 case kColorId_TableSelectedTextUnfocused: 589 case kColorId_TableSelectedTextUnfocused:
592 return system_colors_[COLOR_BTNTEXT]; 590 return system_colors_[COLOR_BTNTEXT];
(...skipping 1510 matching lines...) Expand 10 before | Expand all | Expand 10 after
2103 break; 2101 break;
2104 case LAST: 2102 case LAST:
2105 NOTREACHED(); 2103 NOTREACHED();
2106 break; 2104 break;
2107 } 2105 }
2108 theme_handles_[theme_name] = handle; 2106 theme_handles_[theme_name] = handle;
2109 return handle; 2107 return handle;
2110 } 2108 }
2111 2109
2112 } // namespace ui 2110 } // namespace ui
OLDNEW
« no previous file with comments | « ui/native_theme/native_theme_mac.mm ('k') | ui/views/controls/tree/tree_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698