Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(978)

Side by Side Diff: chrome/browser/android/bookmarks/bookmarks_bridge.h

Issue 586913002: Add BookmarkUndoService to Android build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 #ifndef CHROME_BROWSER_ANDROID_BOOKMARKS_BOOKMARKS_BRIDGE_H_ 5 #ifndef CHROME_BROWSER_ANDROID_BOOKMARKS_BOOKMARKS_BRIDGE_H_
6 #define CHROME_BROWSER_ANDROID_BOOKMARKS_BOOKMARKS_BRIDGE_H_ 6 #define CHROME_BROWSER_ANDROID_BOOKMARKS_BOOKMARKS_BRIDGE_H_
7 7
8 #include <jni.h> 8 #include <jni.h>
9 9
10 #include "base/android/jni_android.h" 10 #include "base/android/jni_android.h"
11 #include "base/android/jni_weak_ref.h" 11 #include "base/android/jni_weak_ref.h"
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" 14 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
15 #include "chrome/browser/bookmarks/chrome_bookmark_client.h" 15 #include "chrome/browser/bookmarks/chrome_bookmark_client.h"
16 #include "components/bookmarks/browser/base_bookmark_model_observer.h" 16 #include "components/bookmarks/browser/base_bookmark_model_observer.h"
17 #include "components/bookmarks/common/android/bookmark_id.h" 17 #include "components/bookmarks/common/android/bookmark_id.h"
18 18
19 namespace bookmarks {
20 class ScopedGroupBookmarkActions;
21 };
sky 2014/09/22 23:25:20 nit: no ;
22
19 class Profile; 23 class Profile;
20 24
21 // The delegate to fetch bookmarks information for the Android native 25 // The delegate to fetch bookmarks information for the Android native
22 // bookmark page. This fetches the bookmarks, title, urls, folder 26 // bookmark page. This fetches the bookmarks, title, urls, folder
23 // hierarchy. 27 // hierarchy.
24 class BookmarksBridge : public BaseBookmarkModelObserver, 28 class BookmarksBridge : public BaseBookmarkModelObserver,
25 public PartnerBookmarksShim::Observer { 29 public PartnerBookmarksShim::Observer {
26 public: 30 public:
27 BookmarksBridge(JNIEnv* env, jobject obj, jobject j_profile); 31 BookmarksBridge(JNIEnv* env, jobject obj, jobject j_profile);
28 void Destroy(JNIEnv*, jobject); 32 void Destroy(JNIEnv*, jobject);
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
123 jint index); 127 jint index);
124 128
125 base::android::ScopedJavaLocalRef<jobject> AddBookmark( 129 base::android::ScopedJavaLocalRef<jobject> AddBookmark(
126 JNIEnv* env, 130 JNIEnv* env,
127 jobject obj, 131 jobject obj,
128 jobject j_parent_id_obj, 132 jobject j_parent_id_obj,
129 jint index, 133 jint index,
130 jstring j_title, 134 jstring j_title,
131 jstring j_url); 135 jstring j_url);
132 136
137 void Undo(JNIEnv* env, jobject obj);
138
139 void StartGroupingUndos(JNIEnv* env, jobject obj);
140
141 void EndGroupingUndos(JNIEnv* env, jobject obj);
142
133 private: 143 private:
134 virtual ~BookmarksBridge(); 144 virtual ~BookmarksBridge();
135 145
136 base::android::ScopedJavaLocalRef<jobject> CreateJavaBookmark( 146 base::android::ScopedJavaLocalRef<jobject> CreateJavaBookmark(
137 const BookmarkNode* node); 147 const BookmarkNode* node);
138 void ExtractBookmarkNodeInformation( 148 void ExtractBookmarkNodeInformation(
139 const BookmarkNode* node, 149 const BookmarkNode* node,
140 jobject j_result_obj); 150 jobject j_result_obj);
141 const BookmarkNode* GetNodeByID(long node_id, int type); 151 const BookmarkNode* GetNodeByID(long node_id, int type);
142 const BookmarkNode* GetFolderWithFallback(long folder_id, int type); 152 const BookmarkNode* GetFolderWithFallback(long folder_id, int type);
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 192
183 // Override PartnerBookmarksShim::Observer 193 // Override PartnerBookmarksShim::Observer
184 virtual void PartnerShimChanged(PartnerBookmarksShim* shim) OVERRIDE; 194 virtual void PartnerShimChanged(PartnerBookmarksShim* shim) OVERRIDE;
185 virtual void PartnerShimLoaded(PartnerBookmarksShim* shim) OVERRIDE; 195 virtual void PartnerShimLoaded(PartnerBookmarksShim* shim) OVERRIDE;
186 virtual void ShimBeingDeleted(PartnerBookmarksShim* shim) OVERRIDE; 196 virtual void ShimBeingDeleted(PartnerBookmarksShim* shim) OVERRIDE;
187 197
188 Profile* profile_; 198 Profile* profile_;
189 JavaObjectWeakGlobalRef weak_java_ref_; 199 JavaObjectWeakGlobalRef weak_java_ref_;
190 BookmarkModel* bookmark_model_; // weak 200 BookmarkModel* bookmark_model_; // weak
191 ChromeBookmarkClient* client_; // weak 201 ChromeBookmarkClient* client_; // weak
202 scoped_ptr<bookmarks::ScopedGroupBookmarkActions> grouped_bookmark_actions_;
192 203
193 // Information about the Partner bookmarks (must check for IsLoaded()). 204 // Information about the Partner bookmarks (must check for IsLoaded()).
194 // This is owned by profile. 205 // This is owned by profile.
195 PartnerBookmarksShim* partner_bookmarks_shim_; 206 PartnerBookmarksShim* partner_bookmarks_shim_;
196 207
197 DISALLOW_COPY_AND_ASSIGN(BookmarksBridge); 208 DISALLOW_COPY_AND_ASSIGN(BookmarksBridge);
198 }; 209 };
199 210
200 #endif // CHROME_BROWSER_ANDROID_BOOKMARKS_BOOKMARKS_BRIDGE_H_ 211 #endif // CHROME_BROWSER_ANDROID_BOOKMARKS_BOOKMARKS_BRIDGE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698