| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/web_contents_factory.h" | 5 #include "chrome/browser/android/web_contents_factory.h" |
| 6 | 6 |
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "chrome/browser/browser_process.h" | 8 #include "chrome/browser/browser_process.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/profiles/profile_manager.h" | 10 #include "chrome/browser/profiles/profile_manager.h" |
| 11 #include "content/public/browser/android/content_view_core.h" | 11 #include "content/public/browser/android/content_view_core.h" |
| 12 #include "content/public/browser/web_contents.h" | 12 #include "content/public/browser/web_contents.h" |
| 13 #include "jni/WebContentsFactory_jni.h" | 13 #include "jni/WebContentsFactory_jni.h" |
| 14 | 14 |
| 15 using base::android::JavaParamRef; |
| 16 using base::android::ScopedJavaLocalRef; |
| 17 |
| 15 static ScopedJavaLocalRef<jobject> CreateWebContents( | 18 static ScopedJavaLocalRef<jobject> CreateWebContents( |
| 16 JNIEnv* env, | 19 JNIEnv* env, |
| 17 const JavaParamRef<jclass>& clazz, | 20 const JavaParamRef<jclass>& clazz, |
| 18 jboolean incognito, | 21 jboolean incognito, |
| 19 jboolean initially_hidden, | 22 jboolean initially_hidden, |
| 20 jboolean initialize_renderer) { | 23 jboolean initialize_renderer) { |
| 21 Profile* profile = g_browser_process->profile_manager()->GetLastUsedProfile(); | 24 Profile* profile = g_browser_process->profile_manager()->GetLastUsedProfile(); |
| 22 if (incognito) | 25 if (incognito) |
| 23 profile = profile->GetOffTheRecordProfile(); | 26 profile = profile->GetOffTheRecordProfile(); |
| 24 | 27 |
| 25 content::WebContents::CreateParams params(profile); | 28 content::WebContents::CreateParams params(profile); |
| 26 params.initially_hidden = static_cast<bool>(initially_hidden); | 29 params.initially_hidden = static_cast<bool>(initially_hidden); |
| 27 params.initialize_renderer = static_cast<bool>(initialize_renderer); | 30 params.initialize_renderer = static_cast<bool>(initialize_renderer); |
| 28 return content::WebContents::Create(params)->GetJavaWebContents(); | 31 return content::WebContents::Create(params)->GetJavaWebContents(); |
| 29 } | 32 } |
| 30 | 33 |
| 31 bool RegisterWebContentsFactory(JNIEnv* env) { | 34 bool RegisterWebContentsFactory(JNIEnv* env) { |
| 32 return RegisterNativesImpl(env); | 35 return RegisterNativesImpl(env); |
| 33 } | 36 } |
| OLD | NEW |