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

Side by Side Diff: chrome/browser/ui/android/toolbar/toolbar_model_android.cc

Issue 2076303002: Delete query in omnibox code. R.I.P. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove unused header. Created 4 years, 6 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/ui/android/toolbar/toolbar_model_android.h" 5 #include "chrome/browser/ui/android/toolbar/toolbar_model_android.h"
6 6
7 #include "base/android/jni_string.h" 7 #include "base/android/jni_string.h"
8 #include "base/metrics/field_trial.h" 8 #include "base/metrics/field_trial.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/search/search.h" 10 #include "chrome/browser/search/search.h"
(...skipping 21 matching lines...) Expand all
32 delete this; 32 delete this;
33 } 33 }
34 34
35 ScopedJavaLocalRef<jstring> ToolbarModelAndroid::GetText( 35 ScopedJavaLocalRef<jstring> ToolbarModelAndroid::GetText(
36 JNIEnv* env, 36 JNIEnv* env,
37 const JavaParamRef<jobject>& obj) { 37 const JavaParamRef<jobject>& obj) {
38 return base::android::ConvertUTF16ToJavaString(env, 38 return base::android::ConvertUTF16ToJavaString(env,
39 toolbar_model_->GetText()); 39 toolbar_model_->GetText());
40 } 40 }
41 41
42 ScopedJavaLocalRef<jstring> ToolbarModelAndroid::GetCorpusChipText(
43 JNIEnv* env,
44 const JavaParamRef<jobject>& obj) {
45 return base::android::ConvertUTF16ToJavaString(
46 env,
47 toolbar_model_->GetCorpusNameForMobile());
48 }
49
50 jboolean ToolbarModelAndroid::WouldReplaceURL(
51 JNIEnv* env,
52 const JavaParamRef<jobject>& obj) {
53 return toolbar_model_->WouldReplaceURL();
54 }
55
56 content::WebContents* ToolbarModelAndroid::GetActiveWebContents() const { 42 content::WebContents* ToolbarModelAndroid::GetActiveWebContents() const {
57 JNIEnv* env = base::android::AttachCurrentThread(); 43 JNIEnv* env = base::android::AttachCurrentThread();
58 ScopedJavaLocalRef<jobject> jdelegate = weak_java_delegate_.get(env); 44 ScopedJavaLocalRef<jobject> jdelegate = weak_java_delegate_.get(env);
59 if (!jdelegate.obj()) 45 if (!jdelegate.obj())
60 return NULL; 46 return NULL;
61 ScopedJavaLocalRef<jobject> jweb_contents = 47 ScopedJavaLocalRef<jobject> jweb_contents =
62 Java_ToolbarModelDelegate_getActiveWebContents(env, jdelegate.obj()); 48 Java_ToolbarModelDelegate_getActiveWebContents(env, jdelegate.obj());
63 return content::WebContents::FromJavaWebContents(jweb_contents.obj()); 49 return content::WebContents::FromJavaWebContents(jweb_contents.obj());
64 } 50 }
65 51
66 // static 52 // static
67 bool ToolbarModelAndroid::RegisterToolbarModelAndroid(JNIEnv* env) { 53 bool ToolbarModelAndroid::RegisterToolbarModelAndroid(JNIEnv* env) {
68 return RegisterNativesImpl(env); 54 return RegisterNativesImpl(env);
69 } 55 }
70 56
71 // static 57 // static
72 jlong Init(JNIEnv* env, 58 jlong Init(JNIEnv* env,
73 const JavaParamRef<jobject>& obj, 59 const JavaParamRef<jobject>& obj,
74 const JavaParamRef<jobject>& delegate) { 60 const JavaParamRef<jobject>& delegate) {
75 ToolbarModelAndroid* toolbar_model = new ToolbarModelAndroid(env, delegate); 61 ToolbarModelAndroid* toolbar_model = new ToolbarModelAndroid(env, delegate);
76 return reinterpret_cast<intptr_t>(toolbar_model); 62 return reinterpret_cast<intptr_t>(toolbar_model);
77 } 63 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698