| Index: components/web_contents_delegate_android/color_chooser_android.h
|
| diff --git a/components/web_contents_delegate_android/color_chooser_android.h b/components/web_contents_delegate_android/color_chooser_android.h
|
| index 8ab332603a84fa55d1ea5b3178445b3dd8a0a727..98d698af101248b2dcb3e3bd4fbbc7e108699901 100644
|
| --- a/components/web_contents_delegate_android/color_chooser_android.h
|
| +++ b/components/web_contents_delegate_android/color_chooser_android.h
|
| @@ -5,9 +5,11 @@
|
| #ifndef COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_COLOR_CHOOSER_ANDROID_H_
|
| #define COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_COLOR_CHOOSER_ANDROID_H_
|
|
|
| +#include <vector>
|
| #include "base/android/jni_android.h"
|
| #include "base/basictypes.h"
|
| #include "base/compiler_specific.h"
|
| +#include "base/strings/string16.h"
|
| #include "content/public/browser/color_chooser.h"
|
|
|
| using base::android::AttachCurrentThread;
|
| @@ -23,7 +25,9 @@ namespace web_contents_delegate_android {
|
| class ColorChooserAndroid : public content::ColorChooser {
|
| public:
|
| ColorChooserAndroid(content::WebContents* tab,
|
| - SkColor initial_color);
|
| + SkColor initial_color,
|
| + const std::vector<SkColor>& suggestions,
|
| + const std::vector<string16>& suggestion_labels);
|
| virtual ~ColorChooserAndroid();
|
|
|
| void OnColorChosen(JNIEnv* env, jobject obj, jint color);
|
|
|