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/bottombar/contextualsearch/contextual_search_pa
nel.h" | 5 #include "chrome/browser/android/bottombar/contextualsearch/contextual_search_pa
nel.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 | 8 |
9 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
134 navigation_interception::InterceptNavigationDelegate::Associate( | 134 navigation_interception::InterceptNavigationDelegate::Associate( |
135 web_contents, | 135 web_contents, |
136 make_scoped_ptr(new navigation_interception::InterceptNavigationDelegate( | 136 make_scoped_ptr(new navigation_interception::InterceptNavigationDelegate( |
137 env, delegate))); | 137 env, delegate))); |
138 } | 138 } |
139 | 139 |
140 bool RegisterContextualSearchPanel(JNIEnv* env) { | 140 bool RegisterContextualSearchPanel(JNIEnv* env) { |
141 return RegisterNativesImpl(env); | 141 return RegisterNativesImpl(env); |
142 } | 142 } |
143 | 143 |
144 jlong Init(JNIEnv* env, jobject obj) { | 144 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) { |
145 ContextualSearchPanel* manager = new ContextualSearchPanel(env, obj); | 145 ContextualSearchPanel* manager = new ContextualSearchPanel(env, obj); |
146 return reinterpret_cast<intptr_t>(manager); | 146 return reinterpret_cast<intptr_t>(manager); |
147 } | 147 } |
OLD | NEW |