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

Side by Side Diff: sky/engine/testing/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/public/platform/WebThemeEngine.h ('k') | sky/viewer/platform/webthemeengine_impl.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 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/engine/testing/platform/webthemeengine_impl.h" 5 #include "sky/engine/testing/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 25 matching lines...) Expand all
36 case WebThemeEngine::PartScrollbarVerticalTrack: 36 case WebThemeEngine::PartScrollbarVerticalTrack:
37 return ui::NativeTheme::kScrollbarVerticalTrack; 37 return ui::NativeTheme::kScrollbarVerticalTrack;
38 case WebThemeEngine::PartScrollbarCorner: 38 case WebThemeEngine::PartScrollbarCorner:
39 return ui::NativeTheme::kScrollbarCorner; 39 return ui::NativeTheme::kScrollbarCorner;
40 case WebThemeEngine::PartCheckbox: 40 case WebThemeEngine::PartCheckbox:
41 return ui::NativeTheme::kCheckbox; 41 return ui::NativeTheme::kCheckbox;
42 case WebThemeEngine::PartRadio: 42 case WebThemeEngine::PartRadio:
43 return ui::NativeTheme::kRadio; 43 return ui::NativeTheme::kRadio;
44 case WebThemeEngine::PartButton: 44 case WebThemeEngine::PartButton:
45 return ui::NativeTheme::kPushButton; 45 return ui::NativeTheme::kPushButton;
46 case WebThemeEngine::PartTextField:
47 return ui::NativeTheme::kTextField;
48 case WebThemeEngine::PartMenuList: 46 case WebThemeEngine::PartMenuList:
49 return ui::NativeTheme::kMenuList; 47 return ui::NativeTheme::kMenuList;
50 case WebThemeEngine::PartSliderTrack: 48 case WebThemeEngine::PartSliderTrack:
51 return ui::NativeTheme::kSliderTrack; 49 return ui::NativeTheme::kSliderTrack;
52 case WebThemeEngine::PartSliderThumb: 50 case WebThemeEngine::PartSliderThumb:
53 return ui::NativeTheme::kSliderThumb; 51 return ui::NativeTheme::kSliderThumb;
54 case WebThemeEngine::PartInnerSpinButton: 52 case WebThemeEngine::PartInnerSpinButton:
55 return ui::NativeTheme::kInnerSpinButton; 53 return ui::NativeTheme::kInnerSpinButton;
56 case WebThemeEngine::PartProgressBar: 54 case WebThemeEngine::PartProgressBar:
57 return ui::NativeTheme::kProgressBar; 55 return ui::NativeTheme::kProgressBar;
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 case WebThemeEngine::PartButton: 102 case WebThemeEngine::PartButton:
105 native_theme_extra_params->button.is_default = 103 native_theme_extra_params->button.is_default =
106 extra_params->button.isDefault; 104 extra_params->button.isDefault;
107 native_theme_extra_params->button.has_border = 105 native_theme_extra_params->button.has_border =
108 extra_params->button.hasBorder; 106 extra_params->button.hasBorder;
109 // Native buttons have a different focus style. 107 // Native buttons have a different focus style.
110 native_theme_extra_params->button.is_focused = false; 108 native_theme_extra_params->button.is_focused = false;
111 native_theme_extra_params->button.background_color = 109 native_theme_extra_params->button.background_color =
112 extra_params->button.backgroundColor; 110 extra_params->button.backgroundColor;
113 break; 111 break;
114 case WebThemeEngine::PartTextField:
115 native_theme_extra_params->text_field.is_text_area =
116 extra_params->textField.isTextArea;
117 native_theme_extra_params->text_field.is_listbox =
118 extra_params->textField.isListbox;
119 native_theme_extra_params->text_field.background_color =
120 extra_params->textField.backgroundColor;
121 break;
122 case WebThemeEngine::PartMenuList: 112 case WebThemeEngine::PartMenuList:
123 native_theme_extra_params->menu_list.has_border = 113 native_theme_extra_params->menu_list.has_border =
124 extra_params->menuList.hasBorder; 114 extra_params->menuList.hasBorder;
125 native_theme_extra_params->menu_list.has_border_radius = 115 native_theme_extra_params->menu_list.has_border_radius =
126 extra_params->menuList.hasBorderRadius; 116 extra_params->menuList.hasBorderRadius;
127 native_theme_extra_params->menu_list.arrow_x = 117 native_theme_extra_params->menu_list.arrow_x =
128 extra_params->menuList.arrowX; 118 extra_params->menuList.arrowX;
129 native_theme_extra_params->menu_list.arrow_y = 119 native_theme_extra_params->menu_list.arrow_y =
130 extra_params->menuList.arrowY; 120 extra_params->menuList.arrowY;
131 native_theme_extra_params->menu_list.background_color = 121 native_theme_extra_params->menu_list.background_color =
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
193 ui::NativeTheme::instance()->PaintStateTransition( 183 ui::NativeTheme::instance()->PaintStateTransition(
194 canvas, 184 canvas,
195 NativeThemePart(part), 185 NativeThemePart(part),
196 NativeThemeState(startState), 186 NativeThemeState(startState),
197 NativeThemeState(endState), 187 NativeThemeState(endState),
198 progress, 188 progress,
199 gfx::Rect(rect)); 189 gfx::Rect(rect));
200 } 190 }
201 191
202 } // namespace sky 192 } // namespace sky
OLDNEW
« no previous file with comments | « sky/engine/public/platform/WebThemeEngine.h ('k') | sky/viewer/platform/webthemeengine_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698