[WebView] Move files from native to browser

android_webview/browser/aw_settings.cc

 // Copyright (c) 2013 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 "android_webview/native/aw_settings.h"
+#include "android_webview/browser/aw_settings.h"
 
 #include "android_webview/browser/aw_content_browser_client.h"
+#include "android_webview/browser/aw_contents.h"
 #include "android_webview/browser/renderer_host/aw_render_view_host_ext.h"
 #include "android_webview/common/aw_content_client.h"
-#include "android_webview/native/aw_contents.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/supports_user_data.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/renderer_preferences.h"
@@ skipping 10 matching lines @@
 
 namespace android_webview {
 
 namespace {
 
 void PopulateFixedRendererPreferences(RendererPreferences* prefs) {
   prefs->tap_multiple_targets_strategy =
       content::TAP_MULTIPLE_TARGETS_STRATEGY_NONE;
 
   // TODO(boliu): Deduplicate with chrome/ code.
-  CR_DEFINE_STATIC_LOCAL(const gfx::FontRenderParams, params,
+  CR_DEFINE_STATIC_LOCAL(
+      const gfx::FontRenderParams, params,
       (gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), NULL)));
   prefs->should_antialias_text = params.antialiasing;
   prefs->use_subpixel_positioning = params.subpixel_positioning;
   prefs->hinting = params.hinting;
   prefs->use_autohinter = params.autohinter;
   prefs->use_bitmaps = params.use_bitmaps;
   prefs->subpixel_rendering = params.subpixel_rendering;
 }
 
 void PopulateFixedWebPreferences(WebPreferences* web_prefs) {
@@ skipping 47 matching lines @@
 
 void AwSettings::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   delete this;
 }
 
 AwSettings* AwSettings::FromWebContents(content::WebContents* web_contents) {
   return AwSettingsUserData::GetSettings(web_contents);
 }
 
 AwRenderViewHostExt* AwSettings::GetAwRenderViewHostExt() {
-  if (!web_contents()) return NULL;
+  if (!web_contents())
+    return NULL;
   AwContents* contents = AwContents::FromWebContents(web_contents());
-  if (!contents) return NULL;
+  if (!contents)
+    return NULL;
   return contents->render_view_host_ext();
 }
 
 void AwSettings::ResetScrollAndScaleState(JNIEnv* env,
                                           const JavaParamRef<jobject>& obj) {
   AwRenderViewHostExt* rvhe = GetAwRenderViewHostExt();
-  if (!rvhe) return;
+  if (!rvhe)
+    return;
   rvhe->ResetScrollAndScaleState();
 }
 
 void AwSettings::UpdateEverything() {
   JNIEnv* env = base::android::AttachCurrentThread();
   CHECK(env);
   ScopedJavaLocalRef<jobject> scoped_obj = aw_settings_.get(env);
   if (scoped_obj.is_null())
     return;
   // Grab the lock and call UpdateEverythingLocked.
   Java_AwSettings_updateEverything(env, scoped_obj);
 }
 
 void AwSettings::UpdateEverythingLocked(JNIEnv* env,
                                         const JavaParamRef<jobject>& obj) {
   UpdateInitialPageScaleLocked(env, obj);
   UpdateWebkitPreferencesLocked(env, obj);
   UpdateUserAgentLocked(env, obj);
   ResetScrollAndScaleState(env, obj);
   UpdateFormDataPreferencesLocked(env, obj);
   UpdateRendererPreferencesLocked(env, obj);
   UpdateOffscreenPreRasterLocked(env, obj);
 }
 
 void AwSettings::UpdateUserAgentLocked(JNIEnv* env,
                                        const JavaParamRef<jobject>& obj) {
-  if (!web_contents()) return;
+  if (!web_contents())
+    return;
 
   ScopedJavaLocalRef<jstring> str =
       Java_AwSettings_getUserAgentLocked(env, obj);
   bool ua_overidden = str.obj() != NULL;
 
   if (ua_overidden) {
     std::string override = base::android::ConvertJavaStringToUTF8(str);
     web_contents()->SetUserAgentOverride(override);
   }
 
   const content::NavigationController& controller =
       web_contents()->GetController();
   for (int i = 0; i < controller.GetEntryCount(); ++i)
     controller.GetEntryAtIndex(i)->SetIsOverridingUserAgent(ua_overidden);
 }
 
 void AwSettings::UpdateWebkitPreferencesLocked(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
-  if (!web_contents()) return;
+  if (!web_contents())
+    return;
   AwRenderViewHostExt* render_view_host_ext = GetAwRenderViewHostExt();
-  if (!render_view_host_ext) return;
+  if (!render_view_host_ext)
+    return;
 
   content::RenderViewHost* render_view_host =
       web_contents()->GetRenderViewHost();
-  if (!render_view_host) return;
+  if (!render_view_host)
+    return;
   render_view_host->OnWebkitPreferencesChanged();
 }
 
 void AwSettings::UpdateInitialPageScaleLocked(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   AwRenderViewHostExt* rvhe = GetAwRenderViewHostExt();
-  if (!rvhe) return;
+  if (!rvhe)
+    return;
 
   float initial_page_scale_percent =
       Java_AwSettings_getInitialPageScalePercentLocked(env, obj);
   if (initial_page_scale_percent == 0) {
     rvhe->SetInitialPageScale(-1);
   } else {
-    float dip_scale = static_cast<float>(
-        Java_AwSettings_getDIPScaleLocked(env, obj));
+    float dip_scale =
+        static_cast<float>(Java_AwSettings_getDIPScaleLocked(env, obj));
     rvhe->SetInitialPageScale(initial_page_scale_percent / dip_scale / 100.0f);
   }
 }
 
 void AwSettings::UpdateFormDataPreferencesLocked(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
-  if (!web_contents()) return;
+  if (!web_contents())
+    return;
   AwContents* contents = AwContents::FromWebContents(web_contents());
-  if (!contents) return;
+  if (!contents)
+    return;
 
   contents->SetSaveFormData(Java_AwSettings_getSaveFormDataLocked(env, obj));
 }
 
 void AwSettings::UpdateRendererPreferencesLocked(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
-  if (!web_contents()) return;
+  if (!web_contents())
+    return;
 
   bool update_prefs = false;
   RendererPreferences* prefs = web_contents()->GetMutableRendererPrefs();
 
   if (!renderer_prefs_initialized_) {
     PopulateFixedRendererPreferences(prefs);
     renderer_prefs_initialized_ = true;
     update_prefs = true;
   }
 
@@ skipping 37 matching lines @@
     return;
   // Grab the lock and call PopulateWebPreferencesLocked.
   Java_AwSettings_populateWebPreferences(env, scoped_obj,
                                          reinterpret_cast<jlong>(web_prefs));
 }
 
 void AwSettings::PopulateWebPreferencesLocked(JNIEnv* env,
                                               const JavaParamRef<jobject>& obj,
                                               jlong web_prefs_ptr) {
   AwRenderViewHostExt* render_view_host_ext = GetAwRenderViewHostExt();
-  if (!render_view_host_ext) return;
+  if (!render_view_host_ext)
+    return;
 
   WebPreferences* web_prefs = reinterpret_cast<WebPreferences*>(web_prefs_ptr);
   PopulateFixedWebPreferences(web_prefs);
 
   web_prefs->text_autosizing_enabled =
       Java_AwSettings_getTextAutosizingEnabledLocked(env, obj);
 
   int text_size_percent = Java_AwSettings_getTextSizePercentLocked(env, obj);
   if (web_prefs->text_autosizing_enabled) {
     web_prefs->font_scale_factor = text_size_percent / 100.0f;
@@ skipping 95 matching lines @@
       Java_AwSettings_supportsDoubleTapZoomLocked(env, obj);
 
   web_prefs->initialize_at_minimum_page_scale =
       Java_AwSettings_getLoadWithOverviewModeLocked(env, obj);
 
   web_prefs->user_gesture_required_for_media_playback =
       Java_AwSettings_getMediaPlaybackRequiresUserGestureLocked(env, obj);
 
   ScopedJavaLocalRef<jstring> url =
       Java_AwSettings_getDefaultVideoPosterURLLocked(env, obj);
-  web_prefs->default_video_poster_url = url.obj() ?
-      GURL(ConvertJavaStringToUTF8(url)) : GURL();
+  web_prefs->default_video_poster_url =
+      url.obj() ? GURL(ConvertJavaStringToUTF8(url)) : GURL();
 
   bool support_quirks = Java_AwSettings_getSupportLegacyQuirksLocked(env, obj);
   // Please see the corresponding Blink settings for bug references.
   web_prefs->support_deprecated_target_density_dpi = support_quirks;
   web_prefs->use_legacy_background_size_shorthand_behavior = support_quirks;
   web_prefs->viewport_meta_layout_size_quirk = support_quirks;
   web_prefs->viewport_meta_merge_content_quirk = support_quirks;
   web_prefs->viewport_meta_non_user_scalable_quirk = support_quirks;
   web_prefs->viewport_meta_zero_values_quirk = support_quirks;
   web_prefs->clobber_user_agent_initial_scale_quirk = support_quirks;
   web_prefs->ignore_main_frame_overflow_hidden_quirk = support_quirks;
   web_prefs->report_screen_size_in_physical_pixels_quirk = support_quirks;
 
   web_prefs->resue_global_for_unowned_main_frame =
       Java_AwSettings_getAllowEmptyDocumentPersistenceLocked(env, obj);
 
   web_prefs->password_echo_enabled =
       Java_AwSettings_getPasswordEchoEnabledLocked(env, obj);
   web_prefs->spatial_navigation_enabled =
       Java_AwSettings_getSpatialNavigationLocked(env, obj);
 
   bool enable_supported_hardware_accelerated_features =
-      Java_AwSettings_getEnableSupportedHardwareAcceleratedFeaturesLocked(
-                env, obj);
+      Java_AwSettings_getEnableSupportedHardwareAcceleratedFeaturesLocked(env,
+                                                                          obj);
 
   bool accelerated_2d_canvas_enabled_by_switch =
       web_prefs->accelerated_2d_canvas_enabled;
   web_prefs->accelerated_2d_canvas_enabled = true;
   if (!accelerated_2d_canvas_enabled_by_switch ||
       !enable_supported_hardware_accelerated_features) {
     // Any canvas smaller than this will fallback to software. Abusing this
     // slightly to turn canvas off without changing
     // accelerated_2d_canvas_enabled, which also affects compositing mode.
     // Using 100M instead of max int to avoid overflows.
@@ skipping 27 matching lines @@
 
   // Keep spellcheck disabled on html elements unless the spellcheck="true"
   // attribute is explicitly specified. This "opt-in" behavior is for backward
   // consistency in apps that use WebView (see crbug.com/652314).
   web_prefs->spellcheck_enabled_by_default = false;
 }
 
 static jlong Init(JNIEnv* env,
                   const JavaParamRef<jobject>& obj,
                   const JavaParamRef<jobject>& web_contents) {
-  content::WebContents* contents = content::WebContents::FromJavaWebContents(
-      web_contents);
+  content::WebContents* contents =
+      content::WebContents::FromJavaWebContents(web_contents);
   AwSettings* settings = new AwSettings(env, obj, contents);
   return reinterpret_cast<intptr_t>(settings);
 }
 
 static ScopedJavaLocalRef<jstring> GetDefaultUserAgent(
     JNIEnv* env,
     const JavaParamRef<jclass>& clazz) {
   return base::android::ConvertUTF8ToJavaString(env, GetUserAgent());
 }
 
 bool RegisterAwSettings(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android_webview