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/bookmarks_bridge.h" | 5 #include "chrome/browser/android/bookmarks/bookmarks_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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
82 const icu::Collator* collator_; | 82 const icu::Collator* collator_; |
83 }; | 83 }; |
84 | 84 |
85 scoped_ptr<icu::Collator> GetICUCollator() { | 85 scoped_ptr<icu::Collator> GetICUCollator() { |
86 UErrorCode error = U_ZERO_ERROR; | 86 UErrorCode error = U_ZERO_ERROR; |
87 scoped_ptr<icu::Collator> collator_; | 87 scoped_ptr<icu::Collator> collator_; |
88 collator_.reset(icu::Collator::createInstance(error)); | 88 collator_.reset(icu::Collator::createInstance(error)); |
89 if (U_FAILURE(error)) | 89 if (U_FAILURE(error)) |
90 collator_.reset(NULL); | 90 collator_.reset(NULL); |
91 | 91 |
92 return collator_.Pass(); | 92 return collator_; |
93 } | 93 } |
94 | 94 |
95 } // namespace | 95 } // namespace |
96 | 96 |
97 BookmarksBridge::BookmarksBridge(JNIEnv* env, jobject obj, jobject j_profile) | 97 BookmarksBridge::BookmarksBridge(JNIEnv* env, jobject obj, jobject j_profile) |
98 : weak_java_ref_(env, obj), | 98 : weak_java_ref_(env, obj), |
99 bookmark_model_(NULL), | 99 bookmark_model_(NULL), |
100 managed_bookmark_service_(NULL), | 100 managed_bookmark_service_(NULL), |
101 partner_bookmarks_shim_(NULL) { | 101 partner_bookmarks_shim_(NULL) { |
102 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 102 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
(...skipping 995 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1098 BookmarkModelChanged(); | 1098 BookmarkModelChanged(); |
1099 } | 1099 } |
1100 | 1100 |
1101 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) { | 1101 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) { |
1102 NotifyIfDoneLoading(); | 1102 NotifyIfDoneLoading(); |
1103 } | 1103 } |
1104 | 1104 |
1105 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) { | 1105 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) { |
1106 partner_bookmarks_shim_ = NULL; | 1106 partner_bookmarks_shim_ = NULL; |
1107 } | 1107 } |
OLD | NEW |