| OLD | NEW |
| 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 #ifndef CHROME_BROWSER_ANDROID_BOOKMARKS_PARTNER_BOOKMARKS_READER_H_ | 5 #ifndef CHROME_BROWSER_ANDROID_BOOKMARKS_PARTNER_BOOKMARKS_READER_H_ |
| 6 #define CHROME_BROWSER_ANDROID_BOOKMARKS_PARTNER_BOOKMARKS_READER_H_ | 6 #define CHROME_BROWSER_ANDROID_BOOKMARKS_PARTNER_BOOKMARKS_READER_H_ |
| 7 | 7 |
| 8 #include "base/android/jni_weak_ref.h" | 8 #include "base/android/jni_weak_ref.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "components/bookmarks/browser/bookmark_model.h" | 10 #include "components/bookmarks/browser/bookmark_model.h" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 void PartnerBookmarksCreationComplete(JNIEnv* env, jobject obj); | 34 void PartnerBookmarksCreationComplete(JNIEnv* env, jobject obj); |
| 35 | 35 |
| 36 // JNI registration | 36 // JNI registration |
| 37 static bool RegisterPartnerBookmarksReader(JNIEnv* env); | 37 static bool RegisterPartnerBookmarksReader(JNIEnv* env); |
| 38 | 38 |
| 39 private: | 39 private: |
| 40 PartnerBookmarksShim* partner_bookmarks_shim_; | 40 PartnerBookmarksShim* partner_bookmarks_shim_; |
| 41 Profile* profile_; | 41 Profile* profile_; |
| 42 | 42 |
| 43 // JNI | 43 // JNI |
| 44 scoped_ptr<BookmarkNode> wip_partner_bookmarks_root_; | 44 scoped_ptr<bookmarks::BookmarkNode> wip_partner_bookmarks_root_; |
| 45 int64 wip_next_available_id_; | 45 int64 wip_next_available_id_; |
| 46 | 46 |
| 47 DISALLOW_COPY_AND_ASSIGN(PartnerBookmarksReader); | 47 DISALLOW_COPY_AND_ASSIGN(PartnerBookmarksReader); |
| 48 }; | 48 }; |
| 49 | 49 |
| 50 #endif // CHROME_BROWSER_ANDROID_BOOKMARKS_PARTNER_BOOKMARKS_READER_H_ | 50 #endif // CHROME_BROWSER_ANDROID_BOOKMARKS_PARTNER_BOOKMARKS_READER_H_ |
| OLD | NEW |