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

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

Issue 2652763013: Cleanup: Remove the last traces of Instant Search on Android (Closed)
Patch Set: Created 3 years, 11 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/android/omnibox/omnibox_prerender.cc ('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 "base/metrics/field_trial.h"
9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/search/search.h"
11 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
12 #include "components/toolbar/toolbar_model_impl.h" 8 #include "components/toolbar/toolbar_model_impl.h"
13 #include "content/public/browser/navigation_entry.h" 9 #include "content/public/browser/navigation_entry.h"
14 #include "content/public/browser/ssl_status.h" 10 #include "content/public/browser/ssl_status.h"
15 #include "content/public/browser/web_contents.h" 11 #include "content/public/browser/web_contents.h"
16 #include "content/public/common/content_constants.h" 12 #include "content/public/common/content_constants.h"
17 #include "jni/ToolbarModel_jni.h" 13 #include "jni/ToolbarModel_jni.h"
18 #include "net/cert/x509_certificate.h"
19 14
20 using base::android::JavaParamRef; 15 using base::android::JavaParamRef;
21 using base::android::ScopedJavaLocalRef; 16 using base::android::ScopedJavaLocalRef;
22 17
23 ToolbarModelAndroid::ToolbarModelAndroid(JNIEnv* env, jobject jdelegate) 18 ToolbarModelAndroid::ToolbarModelAndroid(JNIEnv* env, jobject jdelegate)
24 : toolbar_model_(new ToolbarModelImpl(this, content::kMaxURLDisplayChars)), 19 : toolbar_model_(new ToolbarModelImpl(this, content::kMaxURLDisplayChars)),
25 weak_java_delegate_(env, jdelegate) {} 20 weak_java_delegate_(env, jdelegate) {}
26 21
27 ToolbarModelAndroid::~ToolbarModelAndroid() { 22 ToolbarModelAndroid::~ToolbarModelAndroid() {
28 } 23 }
(...skipping 25 matching lines...) Expand all
54 return RegisterNativesImpl(env); 49 return RegisterNativesImpl(env);
55 } 50 }
56 51
57 // static 52 // static
58 jlong Init(JNIEnv* env, 53 jlong Init(JNIEnv* env,
59 const JavaParamRef<jobject>& obj, 54 const JavaParamRef<jobject>& obj,
60 const JavaParamRef<jobject>& delegate) { 55 const JavaParamRef<jobject>& delegate) {
61 ToolbarModelAndroid* toolbar_model = new ToolbarModelAndroid(env, delegate); 56 ToolbarModelAndroid* toolbar_model = new ToolbarModelAndroid(env, delegate);
62 return reinterpret_cast<intptr_t>(toolbar_model); 57 return reinterpret_cast<intptr_t>(toolbar_model);
63 } 58 }
OLDNEW
« no previous file with comments | « chrome/browser/android/omnibox/omnibox_prerender.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698