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

Side by Side Diff: include/views/SkOSMenu.h

Issue 577243002: update to accommodate latest clang in chrome toolchain (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 3 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 | « include/core/SkRect.h ('k') | src/core/SkMatrix.cpp » ('j') | 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 /* 2 /*
3 * Copyright 2006 The Android Open Source Project 3 * Copyright 2006 The Android Open Source Project
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #ifndef SkOSMenu_DEFINED 10 #ifndef SkOSMenu_DEFINED
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 SkEvent* evt); 122 SkEvent* evt);
123 123
124 /** 124 /**
125 * Create predefined items with the given parameters. To be used with the 125 * Create predefined items with the given parameters. To be used with the
126 * other helper functions below to retrive/update state information. 126 * other helper functions below to retrive/update state information.
127 * Note: the helper functions below assume that slotName is UNIQUE for all 127 * Note: the helper functions below assume that slotName is UNIQUE for all
128 * menu items of the same type since it's used to identify the event 128 * menu items of the same type since it's used to identify the event
129 */ 129 */
130 int appendAction(const char label[], SkEventSinkID target); 130 int appendAction(const char label[], SkEventSinkID target);
131 int appendList(const char label[], const char slotName[], 131 int appendList(const char label[], const char slotName[],
132 SkEventSinkID target, int defaultIndex, const char[] ...); 132 SkEventSinkID target, int defaultIndex, const char* ...);
133 int appendSlider(const char label[], const char slotName[], 133 int appendSlider(const char label[], const char slotName[],
134 SkEventSinkID target, SkScalar min, SkScalar max, 134 SkEventSinkID target, SkScalar min, SkScalar max,
135 SkScalar defaultValue); 135 SkScalar defaultValue);
136 int appendSwitch(const char label[], const char slotName[], 136 int appendSwitch(const char label[], const char slotName[],
137 SkEventSinkID target, bool defaultState = false); 137 SkEventSinkID target, bool defaultState = false);
138 int appendTriState(const char label[], const char slotName[], 138 int appendTriState(const char label[], const char slotName[],
139 SkEventSinkID target, TriState defaultState = kOffState); 139 SkEventSinkID target, TriState defaultState = kOffState);
140 int appendTextField(const char label[], const char slotName[], 140 int appendTextField(const char label[], const char slotName[],
141 SkEventSinkID target, const char placeholder[] = ""); 141 SkEventSinkID target, const char placeholder[] = "");
142 142
(...skipping 30 matching lines...) Expand all
173 private: 173 private:
174 SkString fTitle; 174 SkString fTitle;
175 SkTDArray<Item*> fItems; 175 SkTDArray<Item*> fItems;
176 176
177 // illegal 177 // illegal
178 SkOSMenu(const SkOSMenu&); 178 SkOSMenu(const SkOSMenu&);
179 SkOSMenu& operator=(const SkOSMenu&); 179 SkOSMenu& operator=(const SkOSMenu&);
180 }; 180 };
181 181
182 #endif 182 #endif
OLDNEW
« no previous file with comments | « include/core/SkRect.h ('k') | src/core/SkMatrix.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698