projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 9.38.198.0
[platform/framework/web/crosswalk.git]
/
src
/
android_webview
/
native
/
aw_contents_io_thread_client_impl.cc
diff --git
a/src/android_webview/native/aw_contents_io_thread_client_impl.cc
b/src/android_webview/native/aw_contents_io_thread_client_impl.cc
index
a6912a8
..
8bdbf77
100644
(file)
--- a/
src/android_webview/native/aw_contents_io_thread_client_impl.cc
+++ b/
src/android_webview/native/aw_contents_io_thread_client_impl.cc
@@
-36,6
+36,7
@@
using base::android::ToJavaArrayOfStrings;
using base::LazyInstance;
using content::BrowserThread;
using content::RenderFrameHost;
using base::LazyInstance;
using content::BrowserThread;
using content::RenderFrameHost;
+using content::ResourceType;
using content::WebContents;
using std::map;
using std::pair;
using content::WebContents;
using std::map;
using std::pair;
@@
-242,7
+243,7
@@
AwContentsIoThreadClientImpl::ShouldInterceptRequest(
const content::ResourceRequestInfo* info =
content::ResourceRequestInfo::ForRequest(request);
bool is_main_frame = info &&
const content::ResourceRequestInfo* info =
content::ResourceRequestInfo::ForRequest(request);
bool is_main_frame = info &&
- info->GetResourceType() ==
ResourceType::
MAIN_FRAME;
+ info->GetResourceType() ==
content::RESOURCE_TYPE_
MAIN_FRAME;
bool has_user_gesture = info && info->HasUserGesture();
vector<string> headers_names;
bool has_user_gesture = info && info->HasUserGesture();
vector<string> headers_names;