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

Side by Side Diff: public/web/mac/WebScrollbarTheme.h

Issue 1245323002: Pass scroll bar placement as an enum instead of std::string (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Updates per code review Created 5 years, 5 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 | « public/platform/mac/MacScrollTypes.h ('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 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 14 matching lines...) Expand all
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #ifndef WebScrollbarTheme_h 31 #ifndef WebScrollbarTheme_h
32 #define WebScrollbarTheme_h 32 #define WebScrollbarTheme_h
33 33
34 #include "public/platform/WebCommon.h" 34 #include "public/platform/WebCommon.h"
35 35 #include "public/platform/mac/MacScrollTypes.h"
36 #include <string>
37 36
38 namespace blink { 37 namespace blink {
39 38
40 // This enum must match NSScrollerStyle in the 10.7 SDK. 39 // This enum must match NSScrollerStyle in the 10.7 SDK.
41 enum ScrollerStyle { 40 enum ScrollerStyle {
42 ScrollerStyleLegacy = 0, 41 ScrollerStyleLegacy = 0,
43 ScrollerStyleOverlay = 1 42 ScrollerStyleOverlay = 1
44 }; 43 };
45 44
46 class WebScrollbarTheme { 45 class WebScrollbarTheme {
47 public: 46 public:
48 // Updates the scrollbar appearance and behavior. 47 // Updates the scrollbar appearance and behavior.
49 // |initialButtonDelay| is the current value of NSScrollerButtonDelay from N SUserDefaults. 48 // |initialButtonDelay| is the current value of NSScrollerButtonDelay from N SUserDefaults.
50 // |autoscrollButtonDelay| is the current value of NSScrollerButtonPeriod fr om NSUserDefaults. 49 // |autoscrollButtonDelay| is the current value of NSScrollerButtonPeriod fr om NSUserDefaults.
51 // |preferredScrollerStyle| is the current value of +[NSScroller preferredSc rollerStyle]. 50 // |preferredScrollerStyle| is the current value of +[NSScroller preferredSc rollerStyle].
52 // |redraw| is true if the update requires a redraw to include the change. 51 // |redraw| is true if the update requires a redraw to include the change.
53 // |scrollAnimationEnabled| is the current value of NSScrollAnimationEnabled or AppleScrollAnimationEnabled from NSUserDefaults. 52 // |scrollAnimationEnabled| is the current value of NSScrollAnimationEnabled or AppleScrollAnimationEnabled from NSUserDefaults.
54 // |buttonPlacement| is the current value of AppleScrollBarVariant 53 // |buttonPlacement| is the current value of AppleScrollBarVariant
55 BLINK_EXPORT static void updateScrollbars( 54 BLINK_EXPORT static void updateScrollbars(
56 float initialButtonDelay, float autoscrollButtonDelay, 55 float initialButtonDelay, float autoscrollButtonDelay,
57 ScrollerStyle preferredScrollerStyle, bool redraw); 56 ScrollerStyle preferredScrollerStyle, bool redraw);
58 BLINK_EXPORT static void updateScrollbarsWithNSDefaults( 57 BLINK_EXPORT static void updateScrollbarsWithNSDefaults(
59 float initialButtonDelay, float autoscrollButtonDelay, 58 float initialButtonDelay, float autoscrollButtonDelay,
60 ScrollerStyle preferredScrollerStyle, bool redraw, 59 ScrollerStyle preferredScrollerStyle, bool redraw,
61 bool scrollAnimationEnabled, const std::string& buttonPlacement); 60 bool scrollAnimationEnabled, ScrollbarButtonsPlacement);
62 }; 61 };
63 62
64 } // namespace blink 63 } // namespace blink
65 64
66 #endif 65 #endif
OLDNEW
« no previous file with comments | « public/platform/mac/MacScrollTypes.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698