diff options
| author | benm@chromium.org <benm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-25 16:47:14 +0000 |
|---|---|---|
| committer | benm@chromium.org <benm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-25 16:47:14 +0000 |
| commit | 6e6d12299c9c9d00f1c358576af0275e010e3606 (patch) | |
| tree | 41b16ae7764bbdd8b4d26a7efc28e8133eed9e4a /content/browser/android | |
| parent | 396aa46f46e27892e83c4cd6d00f8d0462518816 (diff) | |
| download | chromium_src-6e6d12299c9c9d00f1c358576af0275e010e3606.zip chromium_src-6e6d12299c9c9d00f1c358576af0275e010e3606.tar.gz chromium_src-6e6d12299c9c9d00f1c358576af0275e010e3606.tar.bz2 | |
[Android] Fix jni_string warnings.
Fix a couple of callsites passing a null jstring into
ConvertJavaaStringToUTF8 which was causing some log
spam.
Review URL: https://chromiumcodereview.appspot.com/12965011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190420 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/android')
| -rw-r--r-- | content/browser/android/content_settings.cc | 3 | ||||
| -rw-r--r-- | content/browser/android/content_view_core_impl.cc | 11 |
2 files changed, 9 insertions, 5 deletions
diff --git a/content/browser/android/content_settings.cc b/content/browser/android/content_settings.cc index 91c63ef..60a6e23 100644 --- a/content/browser/android/content_settings.cc +++ b/content/browser/android/content_settings.cc @@ -425,7 +425,8 @@ void ContentSettings::SyncToNativeImpl() { str.Reset( env, static_cast<jstring>( env->GetObjectField(obj, field_ids_->default_video_poster_url))); - prefs.default_video_poster_url = GURL(ConvertJavaStringToUTF8(str)); + prefs.default_video_poster_url = str.obj() ? + GURL(ConvertJavaStringToUTF8(str)) : GURL(); render_view_host->UpdateWebkitPreferences(prefs); } diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc index f59129f..68cf0c5 100644 --- a/content/browser/android/content_view_core_impl.cc +++ b/content/browser/android/content_view_core_impl.cc @@ -746,10 +746,13 @@ void ContentViewCoreImpl::SetAllUserAgentOverridesInHistory( JNIEnv* env, jobject, jstring user_agent_override) { - std::string override = - base::android::ConvertJavaStringToUTF8(env, user_agent_override); - web_contents_->SetUserAgentOverride(override); - bool override_used = !override.empty(); + bool override_used = user_agent_override != NULL; + if (override_used) { + std::string override = + base::android::ConvertJavaStringToUTF8(env, user_agent_override); + web_contents_->SetUserAgentOverride(override); + } + const NavigationController& controller = web_contents_->GetController(); for (int i = 0; i < controller.GetEntryCount(); ++i) controller.GetEntryAtIndex(i)->SetIsOverridingUserAgent(override_used); |