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

Side by Side Diff: components/web_contents_delegate_android/web_contents_delegate_android.cc

Issue 23026006: Add support for color input datalist on Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 | Annotate | Revision Log
OLDNEW
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 #include "components/web_contents_delegate_android/web_contents_delegate_android .h" 5 #include "components/web_contents_delegate_android/web_contents_delegate_android .h"
6 6
7 #include <android/keycodes.h> 7 #include <android/keycodes.h>
8 8
9 #include "base/android/jni_android.h" 9 #include "base/android/jni_android.h"
10 #include "base/android/jni_array.h" 10 #include "base/android/jni_array.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 43
44 ScopedJavaLocalRef<jobject> 44 ScopedJavaLocalRef<jobject>
45 WebContentsDelegateAndroid::GetJavaDelegate(JNIEnv* env) const { 45 WebContentsDelegateAndroid::GetJavaDelegate(JNIEnv* env) const {
46 return weak_java_delegate_.get(env); 46 return weak_java_delegate_.get(env);
47 } 47 }
48 48
49 // ---------------------------------------------------------------------------- 49 // ----------------------------------------------------------------------------
50 // WebContentsDelegate methods 50 // WebContentsDelegate methods
51 // ---------------------------------------------------------------------------- 51 // ----------------------------------------------------------------------------
52 52
53 ColorChooser* WebContentsDelegateAndroid::OpenColorChooser(WebContents* source, 53 ColorChooser* WebContentsDelegateAndroid::OpenColorChooser(
54 SkColor color) { 54 WebContents* source,
55 return new ColorChooserAndroid(source, color); 55 SkColor color,
56 const std::vector<content::ColorSuggestion>& suggestions) {
57 return new ColorChooserAndroid(source, color, suggestions);
56 } 58 }
57 59
58 // OpenURLFromTab() will be called when we're performing a browser-intiated 60 // OpenURLFromTab() will be called when we're performing a browser-intiated
59 // navigation. The most common scenario for this is opening new tabs (see 61 // navigation. The most common scenario for this is opening new tabs (see
60 // RenderViewImpl::decidePolicyForNavigation for more details). 62 // RenderViewImpl::decidePolicyForNavigation for more details).
61 WebContents* WebContentsDelegateAndroid::OpenURLFromTab( 63 WebContents* WebContentsDelegateAndroid::OpenURLFromTab(
62 WebContents* source, 64 WebContents* source,
63 const content::OpenURLParams& params) { 65 const content::OpenURLParams& params) {
64 const GURL& url = params.url; 66 const GURL& url = params.url;
65 WindowOpenDisposition disposition = params.disposition; 67 WindowOpenDisposition disposition = params.disposition;
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 // Native JNI methods 315 // Native JNI methods
314 // ---------------------------------------------------------------------------- 316 // ----------------------------------------------------------------------------
315 317
316 // Register native methods 318 // Register native methods
317 319
318 bool RegisterWebContentsDelegateAndroid(JNIEnv* env) { 320 bool RegisterWebContentsDelegateAndroid(JNIEnv* env) {
319 return RegisterNativesImpl(env); 321 return RegisterNativesImpl(env);
320 } 322 }
321 323
322 } // namespace web_contents_delegate_android 324 } // namespace web_contents_delegate_android
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698