 Chromium Code Reviews
 Chromium Code Reviews Issue 10536066:
  android content shell bringup.  (Closed) 
  Base URL: svn://svn.chromium.org/chrome/trunk/src
    
  
    Issue 10536066:
  android content shell bringup.  (Closed) 
  Base URL: svn://svn.chromium.org/chrome/trunk/src| Index: content/browser/android/content_util.cc | 
| diff --git a/content/browser/android/content_util.cc b/content/browser/android/content_util.cc | 
| new file mode 100644 | 
| index 0000000000000000000000000000000000000000..91fb35ccc45e5e172e6487de11c2d0ebc9a4aed1 | 
| --- /dev/null | 
| +++ b/content/browser/android/content_util.cc | 
| @@ -0,0 +1,77 @@ | 
| +// Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| +// Use of this source code is governed by a BSD-style license that can be | 
| +// found in the LICENSE file. | 
| + | 
| +#include "content/browser/android/content_util.h" | 
| + | 
| +#include "base/android/jni_android.h" | 
| +#include "base/android/jni_array.h" | 
| +#include "base/android/jni_string.h" | 
| +#include "content/public/browser/web_contents.h" | 
| 
jam
2012/06/08 23:45:09
nit: here and in the rest of the change, the conve
 
John Grabowski
2012/06/12 01:46:29
Sure.  Is there a convention for what files have _
 
jam
2012/06/12 17:44:02
if there's an interface in content/public that is
 | 
| + | 
| +using base::android::AppendJavaStringArrayToStringVector; | 
| +using base::android::CheckException; | 
| +using base::android::ConvertJavaStringToUTF8; | 
| +using base::android::ConvertJavaStringToUTF16; | 
| +using base::android::ConvertUTF8ToJavaString; | 
| +using base::android::ConvertUTF16ToJavaString; | 
| +using base::android::GetClass; | 
| +using base::android::GetFieldID; | 
| +using base::android::GetMethodID; | 
| +using base::android::JavaRef; | 
| +using base::android::ScopedJavaLocalRef; | 
| +using base::android::ToJavaArrayOfStrings; | 
| + | 
| +namespace { | 
| + | 
| +const char kFileChooserParamsClassName[] = | 
| + "org/chromium/content/browser/FileChooserParams"; | 
| + | 
| +} | 
| + | 
| +ScopedJavaLocalRef<jobject> ToJavaFileChooserParams( | 
| + JNIEnv* env, const content::FileChooserParams& file_chooser_params) { | 
| + ScopedJavaLocalRef<jclass> clazz = GetClass(env, kFileChooserParamsClassName); | 
| + jmethodID constructor_id = GetMethodID(env, clazz, "<init>", | 
| + "(ILjava/lang/String;Ljava/lang/String;[Ljava/lang/String;" | 
| + "Ljava/lang/String;)V"); | 
| + | 
| + ScopedJavaLocalRef<jstring> title = | 
| + ConvertUTF16ToJavaString(env, file_chooser_params.title); | 
| + ScopedJavaLocalRef<jstring> default_file_name = | 
| + ConvertUTF8ToJavaString(env, | 
| + file_chooser_params.default_file_name.value()); | 
| + ScopedJavaLocalRef<jobjectArray> accept_types = | 
| + ToJavaArrayOfStrings(env, file_chooser_params.accept_types); | 
| + ScopedJavaLocalRef<jstring> capture = | 
| + ConvertUTF16ToJavaString(env, file_chooser_params.capture); | 
| + | 
| + ScopedJavaLocalRef<jobject> java_params(env, | 
| + env->NewObject(clazz.obj(), | 
| + constructor_id, | 
| + static_cast<jint>(file_chooser_params.mode), | 
| + title.obj(), | 
| + default_file_name.obj(), | 
| + accept_types.obj(), | 
| + capture.obj())); | 
| + CheckException(env); | 
| + | 
| + return java_params; | 
| +} | 
| + | 
| +content::FileChooserParams ToNativeFileChooserParams( | 
| + JNIEnv* env, jint mode, jstring title, jstring default_file, | 
| + jobjectArray accept_types, jstring capture) { | 
| + | 
| 
jam
2012/06/08 23:45:09
nit: blank line
 | 
| + content::FileChooserParams file_chooser_params; | 
| + file_chooser_params.mode = | 
| + static_cast<content::FileChooserParams::Mode>(mode); | 
| + file_chooser_params.title = ConvertJavaStringToUTF16(env, title); | 
| + file_chooser_params.default_file_name = | 
| + FilePath(ConvertJavaStringToUTF8(env, default_file)); | 
| + AppendJavaStringArrayToStringVector(env, accept_types, | 
| + &file_chooser_params.accept_types); | 
| + file_chooser_params.capture = ConvertJavaStringToUTF16(env, capture); | 
| + | 
| + return file_chooser_params; | 
| +} |