Index: android_webview/browser/permission/permission_request_handler.cc |
diff --git a/android_webview/native/permission/permission_request_handler.cc b/android_webview/browser/permission/permission_request_handler.cc |
similarity index 91% |
rename from android_webview/native/permission/permission_request_handler.cc |
rename to android_webview/browser/permission/permission_request_handler.cc |
index 17f4212b89670660477e90920cf2f2f955ad0b27..2dc5cbb09672068504c3efe1179f9cfb33149e84 100644 |
--- a/android_webview/native/permission/permission_request_handler.cc |
+++ b/android_webview/browser/permission/permission_request_handler.cc |
@@ -2,13 +2,13 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "android_webview/native/permission/permission_request_handler.h" |
+#include "android_webview/browser/permission/permission_request_handler.h" |
#include <utility> |
-#include "android_webview/native/permission/aw_permission_request.h" |
-#include "android_webview/native/permission/aw_permission_request_delegate.h" |
-#include "android_webview/native/permission/permission_request_handler_client.h" |
+#include "android_webview/browser/permission/aw_permission_request.h" |
+#include "android_webview/browser/permission/aw_permission_request_delegate.h" |
+#include "android_webview/browser/permission/permission_request_handler_client.h" |
#include "base/android/scoped_java_ref.h" |
#include "base/bind.h" |
#include "content/public/browser/navigation_details.h" |
@@ -22,7 +22,8 @@ namespace android_webview { |
namespace { |
int GetLastCommittedEntryID(content::WebContents* web_contents) { |
- if (!web_contents) return 0; |
+ if (!web_contents) |
+ return 0; |
content::NavigationEntry* entry = |
web_contents->GetController().GetLastCommittedEntry(); |
@@ -36,8 +37,7 @@ PermissionRequestHandler::PermissionRequestHandler( |
content::WebContents* web_contents) |
: content::WebContentsObserver(web_contents), |
client_(client), |
- contents_unique_id_(GetLastCommittedEntryID(web_contents)) { |
-} |
+ contents_unique_id_(GetLastCommittedEntryID(web_contents)) {} |
PermissionRequestHandler::~PermissionRequestHandler() { |
CancelAllRequests(); |
@@ -136,7 +136,7 @@ bool PermissionRequestHandler::Preauthorized(const GURL& origin, |
preauthorized_permission_.find(origin.GetOrigin().spec()); |
return i != preauthorized_permission_.end() && |
- (resources & i->second) == resources; |
+ (resources & i->second) == resources; |
} |
} // namespace android_webivew |