Add BookmarkUndoService to Android build

chrome/browser/android/bookmarks/bookmarks_bridge.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/bookmarks/bookmarks_bridge.h"
 
 #include "base/android/jni_string.h"
 #include "base/containers/stack_container.h"
 #include "base/i18n/string_compare.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h"
 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_android.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
+#include "chrome/browser/undo/bookmark_undo_service.h"
+#include "chrome/browser/undo/bookmark_undo_service_factory.h"
+#include "chrome/browser/undo/undo_manager.h"
 #include "chrome/common/pref_names.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/browser/bookmark_utils.h"
 #include "components/bookmarks/common/android/bookmark_type.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "jni/BookmarksBridge_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF8ToJavaString;
@@ skipping 633 matching lines @@
   if (!new_node) {
     NOTREACHED();
     return ScopedJavaLocalRef<jobject>();
   }
   ScopedJavaLocalRef<jobject> new_java_obj =
       Java_BookmarksBridge_createBookmarkId(
           env, new_node->id(), GetBookmarkType(new_node));
   return new_java_obj;
 }
 
+void BookmarksBridge::Undo(JNIEnv* env, jobject obj) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(IsLoaded());
+  BookmarkUndoService* undo_service =
+      BookmarkUndoServiceFactory::GetForProfile(profile_);
+  UndoManager* undo_manager = undo_service->undo_manager();
+  undo_manager->Undo();
+}
+
+void BookmarksBridge::UndoStartGrouping(JNIEnv* env, jobject obj) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(IsLoaded());
+  BookmarkUndoService* undo_service =
+      BookmarkUndoServiceFactory::GetForProfile(profile_);
+  UndoManager* undo_manager = undo_service->undo_manager();
+  undo_manager->StartGroupingActions();

[Kibeom Kim (inactive), 2014/09/22 17:35:07]

Are we supposed to call the grouping API ourselves?

It looks like BookmarkUndoService class listens to
GroupedBookmarkChangesBeginning and GroupedBookmarkChangesEnded evenets and
calls undo_manager()->StartGroupingActions(); and
undo_manager()->EndGroupingActions(); there. Probably more correct way is
exposing ScopedGroupBookmarkActions class to Java instead?

+}
+
+void BookmarksBridge::UndoEndGrouping(JNIEnv* env, jobject obj) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(IsLoaded());
+  BookmarkUndoService* undo_service =
+      BookmarkUndoServiceFactory::GetForProfile(profile_);
+  UndoManager* undo_manager = undo_service->undo_manager();
+  undo_manager->EndGroupingActions();
+}
+
 ScopedJavaLocalRef<jobject> BookmarksBridge::CreateJavaBookmark(
     const BookmarkNode* node) {
   JNIEnv* env = AttachCurrentThread();
 
   const BookmarkNode* parent = GetParentNode(node);
   int64 parent_id = parent ? parent->id() : -1;
 
   std::string url;
   if (node->is_url())
     url = node->url().spec();
@@ skipping 265 matching lines @@
   BookmarkModelChanged();
 }
 
 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) {
   NotifyIfDoneLoading();
 }
 
 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) {
   partner_bookmarks_shim_ = NULL;
 }