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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: sky/viewer/platform/webthemeengine_impl.cc

Issue 653993007: Remove straggling bits of listboxes. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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 | « sky/engine/testing/platform/webthemeengine_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "sky/viewer/platform/webthemeengine_impl.h" 5 #include "sky/viewer/platform/webthemeengine_impl.h"
6 6
7 #include "skia/ext/platform_canvas.h" 7 #include "skia/ext/platform_canvas.h"
8 #include "sky/engine/public/platform/WebRect.h" 8 #include "sky/engine/public/platform/WebRect.h"
9 #include "sky/engine/public/platform/WebSize.h" 9 #include "sky/engine/public/platform/WebSize.h"
10 #include "ui/native_theme/native_theme.h" 10 #include "ui/native_theme/native_theme.h"
(...skipping 26 matching lines...) Expand all
37 case WebThemeEngine::PartScrollbarVerticalTrack: 37 case WebThemeEngine::PartScrollbarVerticalTrack:
38 return ui::NativeTheme::kScrollbarVerticalTrack; 38 return ui::NativeTheme::kScrollbarVerticalTrack;
39 case WebThemeEngine::PartScrollbarCorner: 39 case WebThemeEngine::PartScrollbarCorner:
40 return ui::NativeTheme::kScrollbarCorner; 40 return ui::NativeTheme::kScrollbarCorner;
41 case WebThemeEngine::PartCheckbox: 41 case WebThemeEngine::PartCheckbox:
42 return ui::NativeTheme::kCheckbox; 42 return ui::NativeTheme::kCheckbox;
43 case WebThemeEngine::PartRadio: 43 case WebThemeEngine::PartRadio:
44 return ui::NativeTheme::kRadio; 44 return ui::NativeTheme::kRadio;
45 case WebThemeEngine::PartButton: 45 case WebThemeEngine::PartButton:
46 return ui::NativeTheme::kPushButton; 46 return ui::NativeTheme::kPushButton;
47 case WebThemeEngine::PartTextField:
48 return ui::NativeTheme::kTextField;
49 case WebThemeEngine::PartMenuList: 47 case WebThemeEngine::PartMenuList:
50 return ui::NativeTheme::kMenuList; 48 return ui::NativeTheme::kMenuList;
51 case WebThemeEngine::PartSliderTrack: 49 case WebThemeEngine::PartSliderTrack:
52 return ui::NativeTheme::kSliderTrack; 50 return ui::NativeTheme::kSliderTrack;
53 case WebThemeEngine::PartSliderThumb: 51 case WebThemeEngine::PartSliderThumb:
54 return ui::NativeTheme::kSliderThumb; 52 return ui::NativeTheme::kSliderThumb;
55 case WebThemeEngine::PartInnerSpinButton: 53 case WebThemeEngine::PartInnerSpinButton:
56 return ui::NativeTheme::kInnerSpinButton; 54 return ui::NativeTheme::kInnerSpinButton;
57 case WebThemeEngine::PartProgressBar: 55 case WebThemeEngine::PartProgressBar:
58 return ui::NativeTheme::kProgressBar; 56 return ui::NativeTheme::kProgressBar;
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 case WebThemeEngine::PartButton: 104 case WebThemeEngine::PartButton:
107 native_theme_extra_params->button.is_default = 105 native_theme_extra_params->button.is_default =
108 extra_params->button.isDefault; 106 extra_params->button.isDefault;
109 native_theme_extra_params->button.has_border = 107 native_theme_extra_params->button.has_border =
110 extra_params->button.hasBorder; 108 extra_params->button.hasBorder;
111 // Native buttons have a different focus style. 109 // Native buttons have a different focus style.
112 native_theme_extra_params->button.is_focused = false; 110 native_theme_extra_params->button.is_focused = false;
113 native_theme_extra_params->button.background_color = 111 native_theme_extra_params->button.background_color =
114 extra_params->button.backgroundColor; 112 extra_params->button.backgroundColor;
115 break; 113 break;
116 case WebThemeEngine::PartTextField:
117 native_theme_extra_params->text_field.is_text_area =
118 extra_params->textField.isTextArea;
119 native_theme_extra_params->text_field.is_listbox =
120 extra_params->textField.isListbox;
121 native_theme_extra_params->text_field.background_color =
122 extra_params->textField.backgroundColor;
123 break;
124 case WebThemeEngine::PartMenuList: 114 case WebThemeEngine::PartMenuList:
125 native_theme_extra_params->menu_list.has_border = 115 native_theme_extra_params->menu_list.has_border =
126 extra_params->menuList.hasBorder; 116 extra_params->menuList.hasBorder;
127 native_theme_extra_params->menu_list.has_border_radius = 117 native_theme_extra_params->menu_list.has_border_radius =
128 extra_params->menuList.hasBorderRadius; 118 extra_params->menuList.hasBorderRadius;
129 native_theme_extra_params->menu_list.arrow_x = 119 native_theme_extra_params->menu_list.arrow_x =
130 extra_params->menuList.arrowX; 120 extra_params->menuList.arrowX;
131 native_theme_extra_params->menu_list.arrow_y = 121 native_theme_extra_params->menu_list.arrow_y =
132 extra_params->menuList.arrowY; 122 extra_params->menuList.arrowY;
133 native_theme_extra_params->menu_list.background_color = 123 native_theme_extra_params->menu_list.background_color =
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 canvas, 193 canvas,
204 NativeThemePart(part), 194 NativeThemePart(part),
205 NativeThemeState(startState), 195 NativeThemeState(startState),
206 NativeThemeState(endState), 196 NativeThemeState(endState),
207 progress, 197 progress,
208 gfx::Rect(rect)); 198 gfx::Rect(rect));
209 #endif 199 #endif
210 } 200 }
211 201
212 } // namespace sky 202 } // namespace sky
OLDNEW
« no previous file with comments | « sky/engine/testing/platform/webthemeengine_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698