Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(653)

Side by Side Diff: chrome/browser/android/content_view_util.cc

Issue 378743002: Navigation transitions: Place transition page in same process as destination page. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix clang build. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/android/content_view_core.h"
11 #include "content/public/browser/web_contents.h" 12 #include "content/public/browser/web_contents.h"
12 #include "jni/ContentViewUtil_jni.h" 13 #include "jni/ContentViewUtil_jni.h"
13 14
14 static jlong CreateNativeWebContents( 15 static jlong CreateNativeWebContents(
15 JNIEnv* env, jclass clazz, jboolean incognito, jboolean initially_hidden) { 16 JNIEnv* env, jclass clazz, jboolean incognito, jboolean initially_hidden) {
16 Profile* profile = g_browser_process->profile_manager()->GetLastUsedProfile(); 17 Profile* profile = g_browser_process->profile_manager()->GetLastUsedProfile();
17 if (incognito) 18 if (incognito)
18 profile = profile->GetOffTheRecordProfile(); 19 profile = profile->GetOffTheRecordProfile();
19 20
20 content::WebContents::CreateParams params(profile); 21 content::WebContents::CreateParams params(profile);
21 params.initially_hidden = static_cast<bool>(initially_hidden); 22 params.initially_hidden = static_cast<bool>(initially_hidden);
22 return reinterpret_cast<intptr_t>(content::WebContents::Create(params)); 23 return reinterpret_cast<intptr_t>(content::WebContents::Create(params));
23 } 24 }
24 25
26 static jlong CreateNativeWebContentsWithSharedSiteInstance(
27 JNIEnv* env,
28 jclass clazz,
29 jobject jcontent_view_core) {
30 content::ContentViewCore* content_view_core =
31 content::ContentViewCore::GetNativeContentViewCore(env,
32 jcontent_view_core);
33 CHECK(content_view_core);
34
35 Profile* profile = Profile::FromBrowserContext(
36 content_view_core->GetWebContents()->GetBrowserContext());
37
38 content::WebContents::CreateParams params(
39 profile, content_view_core->GetWebContents()->GetSiteInstance());
40
41 return reinterpret_cast<intptr_t>(content::WebContents::Create(params));
42 }
43
25 static void DestroyNativeWebContents( 44 static void DestroyNativeWebContents(
26 JNIEnv* env, jclass clazz, jlong web_contents_ptr) { 45 JNIEnv* env, jclass clazz, jlong web_contents_ptr) {
27 content::WebContents* web_contents = 46 content::WebContents* web_contents =
28 reinterpret_cast<content::WebContents*>(web_contents_ptr); 47 reinterpret_cast<content::WebContents*>(web_contents_ptr);
29 delete web_contents; 48 delete web_contents;
30 } 49 }
31 50
32 bool RegisterContentViewUtil(JNIEnv* env) { 51 bool RegisterContentViewUtil(JNIEnv* env) {
33 return RegisterNativesImpl(env); 52 return RegisterNativesImpl(env);
34 } 53 }
OLDNEW
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/ContentViewUtil.java ('k') | content/browser/site_instance_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698