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/content_view_util.h" | 5 #include "chrome/browser/android/content_view_util.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/web_contents.h" | 11 #include "content/public/browser/web_contents.h" |
12 #include "jni/ContentViewUtil_jni.h" | 12 #include "jni/ContentViewUtil_jni.h" |
13 | 13 |
14 static jlong CreateNativeWebContents( | 14 static jlong CreateNativeWebContents( |
15 JNIEnv* env, jclass clazz, jboolean incognito, jboolean initially_hidden) { | 15 JNIEnv* env, jclass clazz, jboolean incognito, jboolean initially_hidden) { |
16 Profile* profile = g_browser_process->profile_manager()->GetLastUsedProfile(); | 16 Profile* profile = g_browser_process->profile_manager()->GetLastUsedProfile(); |
17 if (incognito) | 17 if (incognito) |
18 profile = profile->GetOffTheRecordProfile(); | 18 profile = profile->GetOffTheRecordProfile(); |
19 | 19 |
20 content::WebContents::CreateParams params = | 20 content::WebContents::CreateParams params(profile); |
21 content::WebContents::CreateParams(profile); | |
22 params.initially_hidden = static_cast<bool>(initially_hidden); | 21 params.initially_hidden = static_cast<bool>(initially_hidden); |
23 return reinterpret_cast<intptr_t>(content::WebContents::Create(params)); | 22 return reinterpret_cast<intptr_t>(content::WebContents::Create(params)); |
24 } | 23 } |
25 | 24 |
26 static void DestroyNativeWebContents( | 25 static void DestroyNativeWebContents( |
27 JNIEnv* env, jclass clazz, jlong web_contents_ptr) { | 26 JNIEnv* env, jclass clazz, jlong web_contents_ptr) { |
28 content::WebContents* web_contents = | 27 content::WebContents* web_contents = |
29 reinterpret_cast<content::WebContents*>(web_contents_ptr); | 28 reinterpret_cast<content::WebContents*>(web_contents_ptr); |
30 delete web_contents; | 29 delete web_contents; |
31 } | 30 } |
32 | 31 |
33 bool RegisterContentViewUtil(JNIEnv* env) { | 32 bool RegisterContentViewUtil(JNIEnv* env) { |
34 return RegisterNativesImpl(env); | 33 return RegisterNativesImpl(env); |
35 } | 34 } |
OLD | NEW |