OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/provider/chrome_browser_provider.h" | 5 #include "chrome/browser/android/provider/chrome_browser_provider.h" |
6 | 6 |
7 #include <cmath> | 7 #include <cmath> |
8 #include <list> | 8 #include <list> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
292 | 292 |
293 virtual ~RemoveAllUserBookmarksTask() {} | 293 virtual ~RemoveAllUserBookmarksTask() {} |
294 | 294 |
295 void Run() { | 295 void Run() { |
296 RunOnUIThreadBlocking::Run( | 296 RunOnUIThreadBlocking::Run( |
297 base::Bind(&RemoveAllUserBookmarksTask::RunOnUIThread, model())); | 297 base::Bind(&RemoveAllUserBookmarksTask::RunOnUIThread, model())); |
298 } | 298 } |
299 | 299 |
300 static void RunOnUIThread(BookmarkModel* model) { | 300 static void RunOnUIThread(BookmarkModel* model) { |
301 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 301 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 302 LOG(ERROR) << "begin model->RemoveAllUserBookmarks"; |
302 model->RemoveAllUserBookmarks(); | 303 model->RemoveAllUserBookmarks(); |
| 304 LOG(ERROR) << "after model->RemoveAllUserBookmarks"; |
303 } | 305 } |
304 | 306 |
305 private: | 307 private: |
306 DISALLOW_COPY_AND_ASSIGN(RemoveAllUserBookmarksTask); | 308 DISALLOW_COPY_AND_ASSIGN(RemoveAllUserBookmarksTask); |
307 }; | 309 }; |
308 | 310 |
309 // Utility method to update a bookmark. | 311 // Utility method to update a bookmark. |
310 class UpdateBookmarkTask : public BookmarkModelObserverTask { | 312 class UpdateBookmarkTask : public BookmarkModelObserverTask { |
311 public: | 313 public: |
312 explicit UpdateBookmarkTask(BookmarkModel* model) | 314 explicit UpdateBookmarkTask(BookmarkModel* model) |
(...skipping 1196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1509 ScopedJavaGlobalRef<jobject> jroot; | 1511 ScopedJavaGlobalRef<jobject> jroot; |
1510 ChromeBookmarkClient* client = | 1512 ChromeBookmarkClient* client = |
1511 ChromeBookmarkClientFactory::GetForProfile(profile_); | 1513 ChromeBookmarkClientFactory::GetForProfile(profile_); |
1512 BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile_); | 1514 BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile_); |
1513 GetEditableBookmarkFoldersTask task(client, model); | 1515 GetEditableBookmarkFoldersTask task(client, model); |
1514 task.Run(&jroot); | 1516 task.Run(&jroot); |
1515 return ScopedJavaLocalRef<jobject>(jroot); | 1517 return ScopedJavaLocalRef<jobject>(jroot); |
1516 } | 1518 } |
1517 | 1519 |
1518 void ChromeBrowserProvider::RemoveAllUserBookmarks(JNIEnv* env, jobject obj) { | 1520 void ChromeBrowserProvider::RemoveAllUserBookmarks(JNIEnv* env, jobject obj) { |
| 1521 LOG(ERROR) << "begin ChromeBrowserProvider::RemoveAllUserBookmarks"; |
1519 RemoveAllUserBookmarksTask task(bookmark_model_); | 1522 RemoveAllUserBookmarksTask task(bookmark_model_); |
1520 task.Run(); | 1523 task.Run(); |
| 1524 LOG(ERROR) << "end ChromeBrowserProvider::RemoveAllUserBookmarks"; |
1521 } | 1525 } |
1522 | 1526 |
1523 ScopedJavaLocalRef<jobject> ChromeBrowserProvider::GetBookmarkNode( | 1527 ScopedJavaLocalRef<jobject> ChromeBrowserProvider::GetBookmarkNode( |
1524 JNIEnv* env, jobject obj, jlong id, jboolean get_parent, | 1528 JNIEnv* env, jobject obj, jlong id, jboolean get_parent, |
1525 jboolean get_children) { | 1529 jboolean get_children) { |
1526 ScopedJavaGlobalRef<jobject> jnode; | 1530 ScopedJavaGlobalRef<jobject> jnode; |
1527 GetBookmarkNodeTask task(bookmark_model_); | 1531 GetBookmarkNodeTask task(bookmark_model_); |
1528 task.Run(id, get_parent, get_children, &jnode); | 1532 task.Run(id, get_parent, get_children, &jnode); |
1529 return ScopedJavaLocalRef<jobject>(jnode); | 1533 return ScopedJavaLocalRef<jobject>(jnode); |
1530 } | 1534 } |
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1640 ScopedJavaLocalRef<jobject> obj = weak_java_provider_.get(env); | 1644 ScopedJavaLocalRef<jobject> obj = weak_java_provider_.get(env); |
1641 if (obj.is_null()) | 1645 if (obj.is_null()) |
1642 return; | 1646 return; |
1643 Java_ChromeBrowserProvider_onSearchTermChanged(env, obj.obj()); | 1647 Java_ChromeBrowserProvider_onSearchTermChanged(env, obj.obj()); |
1644 } | 1648 } |
1645 | 1649 |
1646 void ChromeBrowserProvider::OnKeywordSearchTermDeleted( | 1650 void ChromeBrowserProvider::OnKeywordSearchTermDeleted( |
1647 HistoryService* history_service, | 1651 HistoryService* history_service, |
1648 history::URLID url_id) { | 1652 history::URLID url_id) { |
1649 } | 1653 } |
OLD | NEW |