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 10 matching lines...) Expand all Loading... |
21 #include "components/bookmarks/browser/bookmark_match.h" | 21 #include "components/bookmarks/browser/bookmark_match.h" |
22 #include "components/bookmarks/browser/bookmark_model.h" | 22 #include "components/bookmarks/browser/bookmark_model.h" |
23 #include "components/bookmarks/browser/bookmark_utils.h" | 23 #include "components/bookmarks/browser/bookmark_utils.h" |
24 #include "components/bookmarks/browser/scoped_group_bookmark_actions.h" | 24 #include "components/bookmarks/browser/scoped_group_bookmark_actions.h" |
25 #include "components/bookmarks/common/android/bookmark_type.h" | 25 #include "components/bookmarks/common/android/bookmark_type.h" |
26 #include "components/bookmarks/common/bookmark_pref_names.h" | 26 #include "components/bookmarks/common/bookmark_pref_names.h" |
27 #include "components/bookmarks/managed/managed_bookmark_service.h" | 27 #include "components/bookmarks/managed/managed_bookmark_service.h" |
28 #include "components/prefs/pref_service.h" | 28 #include "components/prefs/pref_service.h" |
29 #include "components/query_parser/query_parser.h" | 29 #include "components/query_parser/query_parser.h" |
30 #include "components/signin/core/browser/signin_manager.h" | 30 #include "components/signin/core/browser/signin_manager.h" |
| 31 #include "components/strings/grit/components_strings.h" |
31 #include "components/undo/bookmark_undo_service.h" | 32 #include "components/undo/bookmark_undo_service.h" |
32 #include "components/undo/undo_manager.h" | 33 #include "components/undo/undo_manager.h" |
33 #include "content/public/browser/browser_thread.h" | 34 #include "content/public/browser/browser_thread.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::JavaParamRef; |
42 using base::android::ScopedJavaLocalRef; | 42 using base::android::ScopedJavaLocalRef; |
43 using base::android::ScopedJavaGlobalRef; | 43 using base::android::ScopedJavaGlobalRef; |
44 using base::android::ToJavaIntArray; | 44 using base::android::ToJavaIntArray; |
(...skipping 1041 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1086 BookmarkModelChanged(); | 1086 BookmarkModelChanged(); |
1087 } | 1087 } |
1088 | 1088 |
1089 void BookmarkBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) { | 1089 void BookmarkBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) { |
1090 NotifyIfDoneLoading(); | 1090 NotifyIfDoneLoading(); |
1091 } | 1091 } |
1092 | 1092 |
1093 void BookmarkBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) { | 1093 void BookmarkBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) { |
1094 partner_bookmarks_shim_ = NULL; | 1094 partner_bookmarks_shim_ = NULL; |
1095 } | 1095 } |
OLD | NEW |