OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #ifndef COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_COLOR_CHOOSER_ANDROID_H_ | 5 #ifndef COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_COLOR_CHOOSER_ANDROID_H_ |
6 #define COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_COLOR_CHOOSER_ANDROID_H_ | 6 #define COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_COLOR_CHOOSER_ANDROID_H_ |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
| 9 |
9 #include "base/android/jni_android.h" | 10 #include "base/android/jni_android.h" |
10 #include "base/basictypes.h" | |
11 #include "base/compiler_specific.h" | 11 #include "base/compiler_specific.h" |
| 12 #include "base/macros.h" |
12 #include "base/strings/string16.h" | 13 #include "base/strings/string16.h" |
13 #include "content/public/browser/color_chooser.h" | 14 #include "content/public/browser/color_chooser.h" |
14 | 15 |
15 using base::android::AttachCurrentThread; | 16 using base::android::AttachCurrentThread; |
16 using base::android::ScopedJavaLocalRef; | 17 using base::android::ScopedJavaLocalRef; |
17 | 18 |
18 namespace content { | 19 namespace content { |
19 class WebContents; | 20 class WebContents; |
20 struct ColorSuggestion; | 21 struct ColorSuggestion; |
21 } | 22 } |
(...skipping 25 matching lines...) Expand all Loading... |
47 | 48 |
48 DISALLOW_COPY_AND_ASSIGN(ColorChooserAndroid); | 49 DISALLOW_COPY_AND_ASSIGN(ColorChooserAndroid); |
49 }; | 50 }; |
50 | 51 |
51 // Native JNI methods | 52 // Native JNI methods |
52 bool RegisterColorChooserAndroid(JNIEnv* env); | 53 bool RegisterColorChooserAndroid(JNIEnv* env); |
53 | 54 |
54 } // namespace web_contents_delegate_android | 55 } // namespace web_contents_delegate_android |
55 | 56 |
56 #endif // COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_COLOR_CHOOSER_ANDROID_H_ | 57 #endif // COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_COLOR_CHOOSER_ANDROID_H_ |
OLD | NEW |