| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/android/tab_android.h" | 5 #include "chrome/browser/android/tab_android.h" |
| 6 | 6 |
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "base/android/jni_array.h" | 8 #include "base/android/jni_array.h" |
| 9 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
| 10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
| (...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 params->window_bounds, | 225 params->window_bounds, |
| 226 params->user_gesture, | 226 params->user_gesture, |
| 227 &was_blocked); | 227 &was_blocked); |
| 228 if (was_blocked) | 228 if (was_blocked) |
| 229 params->target_contents = NULL; | 229 params->target_contents = NULL; |
| 230 } | 230 } |
| 231 } | 231 } |
| 232 } | 232 } |
| 233 } | 233 } |
| 234 | 234 |
| 235 bool TabAndroid::ShouldWelcomePageLinkToTermsOfService() { | |
| 236 NOTIMPLEMENTED(); | |
| 237 return false; | |
| 238 } | |
| 239 | |
| 240 bool TabAndroid::HasPrerenderedUrl(GURL gurl) { | 235 bool TabAndroid::HasPrerenderedUrl(GURL gurl) { |
| 241 prerender::PrerenderManager* prerender_manager = GetPrerenderManager(); | 236 prerender::PrerenderManager* prerender_manager = GetPrerenderManager(); |
| 242 if (!prerender_manager) | 237 if (!prerender_manager) |
| 243 return false; | 238 return false; |
| 244 | 239 |
| 245 std::vector<content::WebContents*> contents = | 240 std::vector<content::WebContents*> contents = |
| 246 prerender_manager->GetAllPrerenderingContents(); | 241 prerender_manager->GetAllPrerenderingContents(); |
| 247 prerender::PrerenderContents* prerender_contents; | 242 prerender::PrerenderContents* prerender_contents; |
| 248 for (size_t i = 0; i < contents.size(); ++i) { | 243 for (size_t i = 0; i < contents.size(); ++i) { |
| 249 prerender_contents = prerender_manager-> | 244 prerender_contents = prerender_manager-> |
| (...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 652 | 647 |
| 653 static void Init(JNIEnv* env, jobject obj) { | 648 static void Init(JNIEnv* env, jobject obj) { |
| 654 TRACE_EVENT0("native", "TabAndroid::Init"); | 649 TRACE_EVENT0("native", "TabAndroid::Init"); |
| 655 // This will automatically bind to the Java object and pass ownership there. | 650 // This will automatically bind to the Java object and pass ownership there. |
| 656 new TabAndroid(env, obj); | 651 new TabAndroid(env, obj); |
| 657 } | 652 } |
| 658 | 653 |
| 659 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) { | 654 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) { |
| 660 return RegisterNativesImpl(env); | 655 return RegisterNativesImpl(env); |
| 661 } | 656 } |
| OLD | NEW |