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

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

Issue 2480293004: Mandate unique_ptr for base::IDMap in IDMapOwnPointer mode. (Closed)
Patch Set: Make changes requested by danakj, fix a few more headers Created 4 years 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 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/service_tab_launcher.h" 5 #include "chrome/browser/android/service_tab_launcher.h"
6 6
7 #include "base/android/context_utils.h" 7 #include "base/android/context_utils.h"
8 #include "base/android/jni_string.h" 8 #include "base/android/jni_string.h"
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/memory/ptr_util.h"
10 #include "content/public/browser/browser_context.h" 11 #include "content/public/browser/browser_context.h"
11 #include "content/public/browser/page_navigator.h" 12 #include "content/public/browser/page_navigator.h"
12 #include "content/public/browser/web_contents.h" 13 #include "content/public/browser/web_contents.h"
13 #include "jni/ServiceTabLauncher_jni.h" 14 #include "jni/ServiceTabLauncher_jni.h"
14 15
15 using base::android::AttachCurrentThread; 16 using base::android::AttachCurrentThread;
16 using base::android::ConvertUTF8ToJavaString; 17 using base::android::ConvertUTF8ToJavaString;
17 using base::android::GetApplicationContext; 18 using base::android::GetApplicationContext;
18 using base::android::JavaParamRef; 19 using base::android::JavaParamRef;
19 using base::android::ScopedJavaLocalRef; 20 using base::android::ScopedJavaLocalRef;
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 ScopedJavaLocalRef<jstring> url = ConvertUTF8ToJavaString( 57 ScopedJavaLocalRef<jstring> url = ConvertUTF8ToJavaString(
57 env, params.url.spec()); 58 env, params.url.spec());
58 ScopedJavaLocalRef<jstring> referrer_url = 59 ScopedJavaLocalRef<jstring> referrer_url =
59 ConvertUTF8ToJavaString(env, params.referrer.url.spec()); 60 ConvertUTF8ToJavaString(env, params.referrer.url.spec());
60 ScopedJavaLocalRef<jstring> headers = ConvertUTF8ToJavaString( 61 ScopedJavaLocalRef<jstring> headers = ConvertUTF8ToJavaString(
61 env, params.extra_headers); 62 env, params.extra_headers);
62 63
63 ScopedJavaLocalRef<jobject> post_data; 64 ScopedJavaLocalRef<jobject> post_data;
64 65
65 int request_id = tab_launched_callbacks_.Add( 66 int request_id = tab_launched_callbacks_.Add(
66 new TabLaunchedCallback(callback)); 67 base::MakeUnique<TabLaunchedCallback>(callback));
67 DCHECK_GE(request_id, 1); 68 DCHECK_GE(request_id, 1);
68 69
69 Java_ServiceTabLauncher_launchTab(env, GetApplicationContext(), request_id, 70 Java_ServiceTabLauncher_launchTab(env, GetApplicationContext(), request_id,
70 browser_context->IsOffTheRecord(), url, 71 browser_context->IsOffTheRecord(), url,
71 static_cast<int>(disposition), referrer_url, 72 static_cast<int>(disposition), referrer_url,
72 params.referrer.policy, headers, post_data); 73 params.referrer.policy, headers, post_data);
73 } 74 }
74 75
75 void ServiceTabLauncher::OnTabLaunched(int request_id, 76 void ServiceTabLauncher::OnTabLaunched(int request_id,
76 content::WebContents* web_contents) { 77 content::WebContents* web_contents) {
77 TabLaunchedCallback* callback = tab_launched_callbacks_.Lookup(request_id); 78 TabLaunchedCallback* callback = tab_launched_callbacks_.Lookup(request_id);
78 DCHECK(callback); 79 DCHECK(callback);
79 80
80 if (callback) 81 if (callback)
81 callback->Run(web_contents); 82 callback->Run(web_contents);
82 83
83 tab_launched_callbacks_.Remove(request_id); 84 tab_launched_callbacks_.Remove(request_id);
84 } 85 }
85 86
86 bool ServiceTabLauncher::Register(JNIEnv* env) { 87 bool ServiceTabLauncher::Register(JNIEnv* env) {
87 return RegisterNativesImpl(env); 88 return RegisterNativesImpl(env);
88 } 89 }
OLDNEW
« no previous file with comments | « chrome/browser/android/compositor/layer_title_cache.cc ('k') | chrome/browser/media/android/router/media_router_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698