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

Side by Side Diff: chrome/browser/android/history_report/history_report_jni_bridge.cc

Issue 1542413002: Switch to standard integer types in chrome/browser/, part 1 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/history_report/history_report_jni_bridge.h" 5 #include "chrome/browser/android/history_report/history_report_jni_bridge.h"
6
7 #include <stddef.h>
8 #include <stdint.h>
9
6 #include <vector> 10 #include <vector>
7 11
8 #include "base/android/jni_array.h" 12 #include "base/android/jni_array.h"
9 #include "base/android/jni_string.h" 13 #include "base/android/jni_string.h"
10 #include "base/bind.h" 14 #include "base/bind.h"
11 #include "chrome/browser/android/history_report/data_observer.h" 15 #include "chrome/browser/android/history_report/data_observer.h"
12 #include "chrome/browser/android/history_report/data_provider.h" 16 #include "chrome/browser/android/history_report/data_provider.h"
13 #include "chrome/browser/android/history_report/delta_file_commons.h" 17 #include "chrome/browser/android/history_report/delta_file_commons.h"
14 #include "chrome/browser/android/history_report/delta_file_service.h" 18 #include "chrome/browser/android/history_report/delta_file_service.h"
15 #include "chrome/browser/android/history_report/usage_report_util.h" 19 #include "chrome/browser/android/history_report/usage_report_util.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 JNIEnv* env, 86 JNIEnv* env,
83 const JavaParamRef<jobject>& obj, 87 const JavaParamRef<jobject>& obj,
84 jlong last_seq_no, 88 jlong last_seq_no,
85 jint limit) { 89 jint limit) {
86 scoped_ptr<std::vector<DeltaFileEntryWithData> > entries = 90 scoped_ptr<std::vector<DeltaFileEntryWithData> > entries =
87 data_provider_->Query(last_seq_no, limit); 91 data_provider_->Query(last_seq_no, limit);
88 ScopedJavaLocalRef<jobjectArray> jentries_array = 92 ScopedJavaLocalRef<jobjectArray> jentries_array =
89 history_report::Java_HistoryReportJniBridge_createDeltaFileEntriesArray( 93 history_report::Java_HistoryReportJniBridge_createDeltaFileEntriesArray(
90 env, entries->size()); 94 env, entries->size());
91 95
92 int64 max_seq_no = 0; 96 int64_t max_seq_no = 0;
93 for (size_t i = 0; i < entries->size(); ++i) { 97 for (size_t i = 0; i < entries->size(); ++i) {
94 const DeltaFileEntryWithData& entry = (*entries)[i]; 98 const DeltaFileEntryWithData& entry = (*entries)[i];
95 max_seq_no = max_seq_no < entry.SeqNo() ? entry.SeqNo() : max_seq_no; 99 max_seq_no = max_seq_no < entry.SeqNo() ? entry.SeqNo() : max_seq_no;
96 history_report::Java_HistoryReportJniBridge_setDeltaFileEntry( 100 history_report::Java_HistoryReportJniBridge_setDeltaFileEntry(
97 env, jentries_array.obj(), i, entry.SeqNo(), 101 env, jentries_array.obj(), i, entry.SeqNo(),
98 base::android::ConvertUTF8ToJavaString(env, entry.Type()).obj(), 102 base::android::ConvertUTF8ToJavaString(env, entry.Type()).obj(),
99 base::android::ConvertUTF8ToJavaString(env, entry.Id()).obj(), 103 base::android::ConvertUTF8ToJavaString(env, entry.Id()).obj(),
100 base::android::ConvertUTF8ToJavaString(env, entry.Url()).obj(), 104 base::android::ConvertUTF8ToJavaString(env, entry.Url()).obj(),
101 entry.Score(), 105 entry.Score(),
102 base::android::ConvertUTF16ToJavaString(env, entry.Title()).obj(), 106 base::android::ConvertUTF16ToJavaString(env, entry.Title()).obj(),
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 base::android::ScopedJavaLocalRef<jstring> HistoryReportJniBridge::Dump( 189 base::android::ScopedJavaLocalRef<jstring> HistoryReportJniBridge::Dump(
186 JNIEnv* env, 190 JNIEnv* env,
187 const JavaParamRef<jobject>& obj) { 191 const JavaParamRef<jobject>& obj) {
188 std::string dump; 192 std::string dump;
189 dump.append(delta_file_service_->Dump()); 193 dump.append(delta_file_service_->Dump());
190 dump.append(usage_reports_buffer_service_->Dump()); 194 dump.append(usage_reports_buffer_service_->Dump());
191 return base::android::ConvertUTF8ToJavaString(env, dump); 195 return base::android::ConvertUTF8ToJavaString(env, dump);
192 } 196 }
193 197
194 } // namespace history_report 198 } // namespace history_report
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698