[WebView] Move files from native to browser

android_webview/browser/aw_web_contents_delegate.cc

 // 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 "android_webview/native/aw_web_contents_delegate.h"
+#include "android_webview/browser/aw_web_contents_delegate.h"
 
+#include "android_webview/browser/aw_contents.h"
+#include "android_webview/browser/aw_contents_io_thread_client_impl.h"
 #include "android_webview/browser/aw_javascript_dialog_manager.h"
 #include "android_webview/browser/find_helper.h"
-#include "android_webview/native/aw_contents.h"
-#include "android_webview/native/aw_contents_io_thread_client_impl.h"
-#include "android_webview/native/permission/media_access_permission_request.h"
-#include "android_webview/native/permission/permission_request_handler.h"
+#include "android_webview/browser/permission/media_access_permission_request.h"
+#include "android_webview/browser/permission/permission_request_handler.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/lazy_instance.h"
 #include "base/location.h"
 #include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 22 matching lines @@
 
 // WARNING: these constants are exposed in the public interface Java side, so
 // must remain in sync with what clients are expecting.
 const int kFileChooserModeOpenMultiple = 1 << 0;
 const int kFileChooserModeOpenFolder = 1 << 1;
 
 base::LazyInstance<AwJavaScriptDialogManager>::Leaky
     g_javascript_dialog_manager = LAZY_INSTANCE_INITIALIZER;
 }
 
-AwWebContentsDelegate::AwWebContentsDelegate(
-    JNIEnv* env,
-    jobject obj)
-    : WebContentsDelegateAndroid(env, obj),
-      is_fullscreen_(false) {
-}
+AwWebContentsDelegate::AwWebContentsDelegate(JNIEnv* env, jobject obj)
+    : WebContentsDelegateAndroid(env, obj), is_fullscreen_(false) {}
 
-AwWebContentsDelegate::~AwWebContentsDelegate() {
-}
+AwWebContentsDelegate::~AwWebContentsDelegate() {}
 
 content::JavaScriptDialogManager*
 AwWebContentsDelegate::GetJavaScriptDialogManager(WebContents* source) {
   return g_javascript_dialog_manager.Pointer();
 }
 
 void AwWebContentsDelegate::FindReply(WebContents* web_contents,
                                       int request_id,
                                       int number_of_matches,
                                       const gfx::Rect& selection_rect,
                                       int active_match_ordinal,
                                       bool final_update) {
   AwContents* aw_contents = AwContents::FromWebContents(web_contents);
   if (!aw_contents)
     return;
 
-  aw_contents->GetFindHelper()->HandleFindReply(request_id,
-                                                number_of_matches,
-                                                active_match_ordinal,
-                                                final_update);
+  aw_contents->GetFindHelper()->HandleFindReply(
+      request_id, number_of_matches, active_match_ordinal, final_update);
 }
 
 void AwWebContentsDelegate::CanDownload(
     const GURL& url,
     const std::string& request_method,
     const base::Callback<void(bool)>& callback) {
   // Android webview intercepts download in its resource dispatcher host
   // delegate, so should not reach here.
   NOTREACHED();
   callback.Run(false);
@@ skipping 146 matching lines @@
                  content::MEDIA_DEVICE_FAILED_DUE_TO_SHUTDOWN,
                  std::unique_ptr<content::MediaStreamUI>());
     return;
   }
   aw_contents->GetPermissionRequestHandler()->SendRequest(
       std::unique_ptr<AwPermissionRequestDelegate>(
           new MediaAccessPermissionRequest(request, callback)));
 }
 
 void AwWebContentsDelegate::EnterFullscreenModeForTab(
-    content::WebContents* web_contents, const GURL& origin) {
+    content::WebContents* web_contents,
+    const GURL& origin) {
   WebContentsDelegateAndroid::EnterFullscreenModeForTab(web_contents, origin);
   is_fullscreen_ = true;
   web_contents->GetRenderViewHost()->GetWidget()->WasResized();
 }
 
 void AwWebContentsDelegate::ExitFullscreenModeForTab(
     content::WebContents* web_contents) {
   WebContentsDelegateAndroid::ExitFullscreenModeForTab(web_contents);
   is_fullscreen_ = false;
   web_contents->GetRenderViewHost()->GetWidget()->WasResized();
@@ skipping 23 matching lines @@
   base::android::AppendJavaStringArrayToStringVector(env, file_paths,
                                                      &file_path_str);
   base::android::AppendJavaStringArrayToStringVector(env, display_names,
                                                      &display_name_str);
   std::vector<content::FileChooserFileInfo> files;
   files.reserve(file_path_str.size());
   for (size_t i = 0; i < file_path_str.size(); ++i) {
     GURL url(file_path_str[i]);
     if (!url.is_valid())
       continue;
-    base::FilePath path(url.SchemeIsFile() ?
-        net::UnescapeURLComponent(url.path(),
-            net::UnescapeRule::SPACES |
-            net::UnescapeRule::URL_SPECIAL_CHARS_EXCEPT_PATH_SEPARATORS) :
-            file_path_str[i]);
+    base::FilePath path(
+        url.SchemeIsFile()
+            ? net::UnescapeURLComponent(
+                  url.path(), net::UnescapeRule::SPACES |
+                                  net::UnescapeRule::
+                                      URL_SPECIAL_CHARS_EXCEPT_PATH_SEPARATORS)
+            : file_path_str[i]);
     content::FileChooserFileInfo file_info;
     file_info.file_path = path;
     if (!display_name_str[i].empty())
       file_info.display_name = display_name_str[i];
     files.push_back(file_info);
   }
   FileChooserParams::Mode mode;
   if (mode_flags & kFileChooserModeOpenFolder) {
     mode = FileChooserParams::UploadFolder;
   } else if (mode_flags & kFileChooserModeOpenMultiple) {
     mode = FileChooserParams::OpenMultiple;
   } else {
     mode = FileChooserParams::Open;
   }
   DVLOG(0) << "File Chooser result: mode = " << mode
            << ", file paths = " << base::JoinString(file_path_str, ":");
   rfh->FilesSelectedInChooser(files, mode);
 }
 
 bool RegisterAwWebContentsDelegate(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android_webview