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

Side by Side Diff: chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.h

Issue 679833002: Switch to EnhancedBookmarkModel from meta_accessor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed bookmark_model reference Created 6 years, 1 month 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
« no previous file with comments | « no previous file | chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARKS_BRIDGE_H_ 5 #ifndef CHROME_BROWSER_ANDROID_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARKS_BRIDGE_H_
6 #define CHROME_BROWSER_ANDROID_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARKS_BRIDGE_H_ 6 #define CHROME_BROWSER_ANDROID_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARKS_BRIDGE_H_
7 7
8 #include "base/android/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "base/android/jni_weak_ref.h" 9 #include "base/android/jni_weak_ref.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
(...skipping 29 matching lines...) Expand all
40 jobject j_result_obj); 40 jobject j_result_obj);
41 base::android::ScopedJavaLocalRef<jobjectArray> GetFilters(JNIEnv* env, 41 base::android::ScopedJavaLocalRef<jobjectArray> GetFilters(JNIEnv* env,
42 jobject obj); 42 jobject obj);
43 43
44 // BookmarkServerServiceObserver 44 // BookmarkServerServiceObserver
45 // Called on changes to cluster data 45 // Called on changes to cluster data
46 virtual void OnChange(BookmarkServerService* service) override; 46 virtual void OnChange(BookmarkServerService* service) override;
47 47
48 private: 48 private:
49 JavaObjectWeakGlobalRef weak_java_ref_; 49 JavaObjectWeakGlobalRef weak_java_ref_;
50 BookmarkModel* bookmark_model_; // weak 50 EnhancedBookmarkModel* enhanced_bookmark_model_;
51 BookmarkServerClusterService* cluster_service_; // weak 51 BookmarkServerClusterService* cluster_service_; // weak
52 Profile* profile_; // weak 52 Profile* profile_; // weak
53 DISALLOW_COPY_AND_ASSIGN(EnhancedBookmarksBridge); 53 DISALLOW_COPY_AND_ASSIGN(EnhancedBookmarksBridge);
54 }; 54 };
55 55
56 bool RegisterEnhancedBookmarksBridge(JNIEnv* env); 56 bool RegisterEnhancedBookmarksBridge(JNIEnv* env);
57 57
58 } // namespace android 58 } // namespace android
59 } // namespace enhanced_bookmarks 59 } // namespace enhanced_bookmarks
60 60
61 #endif // CHROME_BROWSER_ANDROID_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARKS_BRIDGE_H _ 61 #endif // CHROME_BROWSER_ANDROID_ENHANCED_BOOKMARKS_ENHANCED_BOOKMARKS_BRIDGE_H _
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/android/enhanced_bookmarks/enhanced_bookmarks_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698