| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/provider/chrome_browser_provider.h" | 5 #include "chrome/browser/android/provider/chrome_browser_provider.h" |
| 6 | 6 |
| 7 #include <list> | 7 #include <list> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/android/jni_android.h" | 10 #include "base/android/jni_android.h" |
| (...skipping 1125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1136 | 1136 |
| 1137 if (date) | 1137 if (date) |
| 1138 row->set_search_time(ConvertJlongToTime(ConvertJLongObjectToPrimitive( | 1138 row->set_search_time(ConvertJlongToTime(ConvertJLongObjectToPrimitive( |
| 1139 env, date))); | 1139 env, date))); |
| 1140 } | 1140 } |
| 1141 | 1141 |
| 1142 } // namespace | 1142 } // namespace |
| 1143 | 1143 |
| 1144 // ------------- Native initialization and destruction ------------- // | 1144 // ------------- Native initialization and destruction ------------- // |
| 1145 | 1145 |
| 1146 static jint Init(JNIEnv* env, jobject obj) { | 1146 static jlong Init(JNIEnv* env, jobject obj) { |
| 1147 ChromeBrowserProvider* provider = new ChromeBrowserProvider(env, obj); | 1147 ChromeBrowserProvider* provider = new ChromeBrowserProvider(env, obj); |
| 1148 return reinterpret_cast<jint>(provider); | 1148 return reinterpret_cast<intptr_t>(provider); |
| 1149 } | 1149 } |
| 1150 | 1150 |
| 1151 bool ChromeBrowserProvider::RegisterChromeBrowserProvider(JNIEnv* env) { | 1151 bool ChromeBrowserProvider::RegisterChromeBrowserProvider(JNIEnv* env) { |
| 1152 return RegisterNativesImpl(env); | 1152 return RegisterNativesImpl(env); |
| 1153 } | 1153 } |
| 1154 | 1154 |
| 1155 ChromeBrowserProvider::ChromeBrowserProvider(JNIEnv* env, jobject obj) | 1155 ChromeBrowserProvider::ChromeBrowserProvider(JNIEnv* env, jobject obj) |
| 1156 : weak_java_provider_(env, obj), | 1156 : weak_java_provider_(env, obj), |
| 1157 handling_extensive_changes_(false) { | 1157 handling_extensive_changes_(false) { |
| 1158 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 1158 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| (...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1611 Java_ChromeBrowserProvider_onBookmarkChanged(env, obj.obj()); | 1611 Java_ChromeBrowserProvider_onBookmarkChanged(env, obj.obj()); |
| 1612 } else if (type == | 1612 } else if (type == |
| 1613 chrome::NOTIFICATION_HISTORY_KEYWORD_SEARCH_TERM_UPDATED) { | 1613 chrome::NOTIFICATION_HISTORY_KEYWORD_SEARCH_TERM_UPDATED) { |
| 1614 JNIEnv* env = AttachCurrentThread(); | 1614 JNIEnv* env = AttachCurrentThread(); |
| 1615 ScopedJavaLocalRef<jobject> obj = weak_java_provider_.get(env); | 1615 ScopedJavaLocalRef<jobject> obj = weak_java_provider_.get(env); |
| 1616 if (obj.is_null()) | 1616 if (obj.is_null()) |
| 1617 return; | 1617 return; |
| 1618 Java_ChromeBrowserProvider_onSearchTermChanged(env, obj.obj()); | 1618 Java_ChromeBrowserProvider_onSearchTermChanged(env, obj.obj()); |
| 1619 } | 1619 } |
| 1620 } | 1620 } |
| OLD | NEW |