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

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

Issue 324283003: Move search_terms_data to components/search_engines (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 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 | Annotate | Revision Log
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/ui_thread_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 }
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
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/tab_model/tab_model.cc ('k') | chrome/browser/ui/search/instant_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698