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

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

Issue 251983002: Rename getSearchTerms as getText (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed indentation Created 6 years, 7 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
« no previous file with comments | « chrome/browser/ui/android/toolbar/toolbar_model_android.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/search/search.h" 9 #include "chrome/browser/search/search.h"
10 #include "chrome/browser/search_engines/search_terms_data.h" 10 #include "chrome/browser/search_engines/search_terms_data.h"
11 #include "chrome/browser/ui/toolbar/toolbar_model_impl.h" 11 #include "chrome/browser/ui/toolbar/toolbar_model_impl.h"
12 #include "content/public/browser/web_contents.h" 12 #include "content/public/browser/web_contents.h"
13 #include "jni/ToolbarModel_jni.h" 13 #include "jni/ToolbarModel_jni.h"
14 14
15 using base::android::ScopedJavaLocalRef; 15 using base::android::ScopedJavaLocalRef;
16 16
17 ToolbarModelAndroid::ToolbarModelAndroid(JNIEnv* env, jobject jdelegate) 17 ToolbarModelAndroid::ToolbarModelAndroid(JNIEnv* env, jobject jdelegate)
18 : toolbar_model_(new ToolbarModelImpl(this)), 18 : toolbar_model_(new ToolbarModelImpl(this)),
19 weak_java_delegate_(env, jdelegate) { 19 weak_java_delegate_(env, jdelegate) {
20 } 20 }
21 21
22 ToolbarModelAndroid::~ToolbarModelAndroid() { 22 ToolbarModelAndroid::~ToolbarModelAndroid() {
23 } 23 }
24 24
25 void ToolbarModelAndroid::Destroy(JNIEnv* env, jobject obj) { 25 void ToolbarModelAndroid::Destroy(JNIEnv* env, jobject obj) {
26 delete this; 26 delete this;
27 } 27 }
28 28
29 ScopedJavaLocalRef<jstring> ToolbarModelAndroid::GetSearchTerms(JNIEnv* env, 29 ScopedJavaLocalRef<jstring> ToolbarModelAndroid::GetText(JNIEnv* env,
30 jobject obj) { 30 jobject obj) {
31 return base::android::ConvertUTF16ToJavaString(env, 31 return base::android::ConvertUTF16ToJavaString(env,
32 toolbar_model_->GetText()); 32 toolbar_model_->GetText());
33 } 33 }
34 34
35 ScopedJavaLocalRef<jstring> ToolbarModelAndroid::GetQueryExtractionParam( 35 ScopedJavaLocalRef<jstring> ToolbarModelAndroid::GetQueryExtractionParam(
36 JNIEnv* env, 36 JNIEnv* env,
37 jobject obj) { 37 jobject obj) {
38 content::WebContents* web_contents = GetActiveWebContents(); 38 content::WebContents* web_contents = GetActiveWebContents();
39 if (!web_contents) 39 if (!web_contents)
40 return ScopedJavaLocalRef<jstring>(); 40 return ScopedJavaLocalRef<jstring>();
(...skipping 29 matching lines...) Expand all
70 // static 70 // static
71 bool ToolbarModelAndroid::RegisterToolbarModelAndroid(JNIEnv* env) { 71 bool ToolbarModelAndroid::RegisterToolbarModelAndroid(JNIEnv* env) {
72 return RegisterNativesImpl(env); 72 return RegisterNativesImpl(env);
73 } 73 }
74 74
75 // static 75 // static
76 jlong Init(JNIEnv* env, jobject obj, jobject delegate) { 76 jlong Init(JNIEnv* env, jobject obj, jobject delegate) {
77 ToolbarModelAndroid* toolbar_model = new ToolbarModelAndroid(env, delegate); 77 ToolbarModelAndroid* toolbar_model = new ToolbarModelAndroid(env, delegate);
78 return reinterpret_cast<intptr_t>(toolbar_model); 78 return reinterpret_cast<intptr_t>(toolbar_model);
79 } 79 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/android/toolbar/toolbar_model_android.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698