diff options
| author | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-01 18:17:53 +0000 |
|---|---|---|
| committer | gman@chromium.org <gman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-01 18:17:53 +0000 |
| commit | 3184f90bff4653bfb7a90ec4a1398559c4668247 (patch) | |
| tree | 80e1db929000e7153d41e8101e4d0c3af08e696b /android_webview | |
| parent | 09c38f53b7ad3cf529f51c32a997aa9fc24fb518 (diff) | |
| download | chromium_src-3184f90bff4653bfb7a90ec4a1398559c4668247.zip chromium_src-3184f90bff4653bfb7a90ec4a1398559c4668247.tar.gz chromium_src-3184f90bff4653bfb7a90ec4a1398559c4668247.tar.bz2 | |
Move WebPreferences to root namespace
This is in preparation to using the IPC_STRUCT_XXX macros
BUG=235200
TBR=darin@chromium.org,brettw@chromium.org
Review URL: https://chromiumcodereview.appspot.com/14364006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197659 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/native/aw_settings.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/android_webview/native/aw_settings.cc b/android_webview/native/aw_settings.cc index a775e1e..8dd383e 100644 --- a/android_webview/native/aw_settings.cc +++ b/android_webview/native/aw_settings.cc @@ -26,7 +26,6 @@ using base::android::GetClass; using base::android::GetFieldID; using base::android::GetMethodIDFromClassName; using base::android::ScopedJavaLocalRef; -using webkit_glue::WebPreferences; namespace android_webview { @@ -233,37 +232,37 @@ void AwSettings::UpdateWebkitPreferences(JNIEnv* env, jobject obj) { ScopedJavaLocalRef<jstring> str( env, static_cast<jstring>( env->GetObjectField(obj, field_ids_->standard_fond_family))); - prefs.standard_font_family_map[WebPreferences::kCommonScript] = + prefs.standard_font_family_map[webkit_glue::kCommonScript] = ConvertJavaStringToUTF16(str); str.Reset( env, static_cast<jstring>( env->GetObjectField(obj, field_ids_->fixed_font_family))); - prefs.fixed_font_family_map[WebPreferences::kCommonScript] = + prefs.fixed_font_family_map[webkit_glue::kCommonScript] = ConvertJavaStringToUTF16(str); str.Reset( env, static_cast<jstring>( env->GetObjectField(obj, field_ids_->sans_serif_font_family))); - prefs.sans_serif_font_family_map[WebPreferences::kCommonScript] = + prefs.sans_serif_font_family_map[webkit_glue::kCommonScript] = ConvertJavaStringToUTF16(str); str.Reset( env, static_cast<jstring>( env->GetObjectField(obj, field_ids_->serif_font_family))); - prefs.serif_font_family_map[WebPreferences::kCommonScript] = + prefs.serif_font_family_map[webkit_glue::kCommonScript] = ConvertJavaStringToUTF16(str); str.Reset( env, static_cast<jstring>( env->GetObjectField(obj, field_ids_->cursive_font_family))); - prefs.cursive_font_family_map[WebPreferences::kCommonScript] = + prefs.cursive_font_family_map[webkit_glue::kCommonScript] = ConvertJavaStringToUTF16(str); str.Reset( env, static_cast<jstring>( env->GetObjectField(obj, field_ids_->fantasy_font_family))); - prefs.fantasy_font_family_map[WebPreferences::kCommonScript] = + prefs.fantasy_font_family_map[webkit_glue::kCommonScript] = ConvertJavaStringToUTF16(str); str.Reset( |