OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/web_contents/web_contents_android.h" | 5 #include "content/browser/web_contents/web_contents_android.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "base/android/jni_string.h" | 8 #include "base/android/jni_string.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/json/json_writer.h" | 10 #include "base/json/json_writer.h" |
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
284 JNIEnv* env = AttachCurrentThread(); | 284 JNIEnv* env = AttachCurrentThread(); |
285 return Java_WebContentsImpl_willHandleDeferAfterResponseStarted(env, | 285 return Java_WebContentsImpl_willHandleDeferAfterResponseStarted(env, |
286 obj_.obj()); | 286 obj_.obj()); |
287 } | 287 } |
288 | 288 |
289 void WebContentsAndroid::DidDeferAfterResponseStarted( | 289 void WebContentsAndroid::DidDeferAfterResponseStarted( |
290 const TransitionLayerData& transition_data) { | 290 const TransitionLayerData& transition_data) { |
291 JNIEnv* env = AttachCurrentThread(); | 291 JNIEnv* env = AttachCurrentThread(); |
292 std::vector<GURL> entering_stylesheets; | 292 std::vector<GURL> entering_stylesheets; |
293 std::string transition_color; | 293 std::string transition_color; |
294 if (transition_data.response_headers) { | 294 if (transition_data.response_headers.get()) { |
295 TransitionRequestManager::ParseTransitionStylesheetsFromHeaders( | 295 TransitionRequestManager::ParseTransitionStylesheetsFromHeaders( |
296 transition_data.response_headers, | 296 transition_data.response_headers, |
297 entering_stylesheets, | 297 entering_stylesheets, |
298 transition_data.request_url); | 298 transition_data.request_url); |
299 | 299 |
300 transition_data.response_headers->EnumerateHeader( | 300 transition_data.response_headers->EnumerateHeader( |
301 NULL, "X-Transition-Entering-Color", &transition_color); | 301 NULL, "X-Transition-Entering-Color", &transition_color); |
302 } | 302 } |
303 | 303 |
304 ScopedJavaLocalRef<jstring> jstring_markup( | 304 ScopedJavaLocalRef<jstring> jstring_markup( |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
359 ScopedJavaGlobalRef<jobject> j_callback; | 359 ScopedJavaGlobalRef<jobject> j_callback; |
360 j_callback.Reset(env, callback); | 360 j_callback.Reset(env, callback); |
361 content::RenderFrameHost::JavaScriptResultCallback js_callback = | 361 content::RenderFrameHost::JavaScriptResultCallback js_callback = |
362 base::Bind(&JavaScriptResultCallback, j_callback); | 362 base::Bind(&JavaScriptResultCallback, j_callback); |
363 | 363 |
364 web_contents_->GetMainFrame()->ExecuteJavaScript( | 364 web_contents_->GetMainFrame()->ExecuteJavaScript( |
365 ConvertJavaStringToUTF16(env, script), js_callback); | 365 ConvertJavaStringToUTF16(env, script), js_callback); |
366 } | 366 } |
367 | 367 |
368 } // namespace content | 368 } // namespace content |
OLD | NEW |