projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
components
/
web_contents_delegate_android
/
color_chooser_android.h
diff --git
a/src/components/web_contents_delegate_android/color_chooser_android.h
b/src/components/web_contents_delegate_android/color_chooser_android.h
index
eefd85b
..
3966d1b
100644
(file)
--- a/
src/components/web_contents_delegate_android/color_chooser_android.h
+++ b/
src/components/web_contents_delegate_android/color_chooser_android.h
@@
-33,8
+33,8
@@
class ColorChooserAndroid : public content::ColorChooser {
void OnColorChosen(JNIEnv* env, jobject obj, jint color);
// ColorChooser interface
void OnColorChosen(JNIEnv* env, jobject obj, jint color);
// ColorChooser interface
- virtual void End()
OVERRIDE
;
- virtual void SetSelectedColor(SkColor color)
OVERRIDE
;
+ virtual void End()
override
;
+ virtual void SetSelectedColor(SkColor color)
override
;
private:
base::android::ScopedJavaGlobalRef<jobject> j_color_chooser_;
private:
base::android::ScopedJavaGlobalRef<jobject> j_color_chooser_;