OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/bookmarks/bookmark_bridge.h" | 5 #include "chrome/browser/android/bookmarks/bookmark_bridge.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include "base/android/jni_array.h" | 10 #include "base/android/jni_array.h" |
(...skipping 20 matching lines...) Expand all Loading... |
31 #include "components/undo/bookmark_undo_service.h" | 31 #include "components/undo/bookmark_undo_service.h" |
32 #include "components/undo/undo_manager.h" | 32 #include "components/undo/undo_manager.h" |
33 #include "content/public/browser/browser_thread.h" | 33 #include "content/public/browser/browser_thread.h" |
34 #include "grit/components_strings.h" | 34 #include "grit/components_strings.h" |
35 #include "jni/BookmarkBridge_jni.h" | 35 #include "jni/BookmarkBridge_jni.h" |
36 #include "ui/base/l10n/l10n_util.h" | 36 #include "ui/base/l10n/l10n_util.h" |
37 | 37 |
38 using base::android::AttachCurrentThread; | 38 using base::android::AttachCurrentThread; |
39 using base::android::ConvertUTF8ToJavaString; | 39 using base::android::ConvertUTF8ToJavaString; |
40 using base::android::ConvertUTF16ToJavaString; | 40 using base::android::ConvertUTF16ToJavaString; |
| 41 using base::android::JavaParamRef; |
41 using base::android::ScopedJavaLocalRef; | 42 using base::android::ScopedJavaLocalRef; |
42 using base::android::ScopedJavaGlobalRef; | 43 using base::android::ScopedJavaGlobalRef; |
43 using base::android::ToJavaIntArray; | 44 using base::android::ToJavaIntArray; |
44 using bookmarks::android::JavaBookmarkIdCreateBookmarkId; | 45 using bookmarks::android::JavaBookmarkIdCreateBookmarkId; |
45 using bookmarks::android::JavaBookmarkIdGetId; | 46 using bookmarks::android::JavaBookmarkIdGetId; |
46 using bookmarks::android::JavaBookmarkIdGetType; | 47 using bookmarks::android::JavaBookmarkIdGetType; |
47 using bookmarks::BookmarkModel; | 48 using bookmarks::BookmarkModel; |
48 using bookmarks::BookmarkNode; | 49 using bookmarks::BookmarkNode; |
49 using bookmarks::BookmarkPermanentNode; | 50 using bookmarks::BookmarkPermanentNode; |
50 using bookmarks::BookmarkType; | 51 using bookmarks::BookmarkType; |
(...skipping 1057 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1108 BookmarkModelChanged(); | 1109 BookmarkModelChanged(); |
1109 } | 1110 } |
1110 | 1111 |
1111 void BookmarkBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) { | 1112 void BookmarkBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) { |
1112 NotifyIfDoneLoading(); | 1113 NotifyIfDoneLoading(); |
1113 } | 1114 } |
1114 | 1115 |
1115 void BookmarkBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) { | 1116 void BookmarkBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) { |
1116 partner_bookmarks_shim_ = NULL; | 1117 partner_bookmarks_shim_ = NULL; |
1117 } | 1118 } |
OLD | NEW |