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

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 #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"
11 #include "base/android/jni_string.h" 11 #include "base/android/jni_string.h"
12 #include "base/containers/stack_container.h" 12 #include "base/containers/stack_container.h"
13 #include "base/i18n/string_compare.h" 13 #include "base/i18n/string_compare.h"
14 #include "base/prefs/pref_service.h"
15 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 14 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
16 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h" 15 #include "chrome/browser/bookmarks/managed_bookmark_service_factory.h"
17 #include "chrome/browser/profiles/incognito_helpers.h" 16 #include "chrome/browser/profiles/incognito_helpers.h"
18 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
19 #include "chrome/browser/profiles/profile_android.h" 18 #include "chrome/browser/profiles/profile_android.h"
20 #include "chrome/browser/signin/signin_manager_factory.h" 19 #include "chrome/browser/signin/signin_manager_factory.h"
21 #include "chrome/browser/undo/bookmark_undo_service_factory.h" 20 #include "chrome/browser/undo/bookmark_undo_service_factory.h"
22 #include "components/bookmarks/browser/bookmark_match.h" 21 #include "components/bookmarks/browser/bookmark_match.h"
23 #include "components/bookmarks/browser/bookmark_model.h" 22 #include "components/bookmarks/browser/bookmark_model.h"
24 #include "components/bookmarks/browser/bookmark_utils.h" 23 #include "components/bookmarks/browser/bookmark_utils.h"
25 #include "components/bookmarks/browser/scoped_group_bookmark_actions.h" 24 #include "components/bookmarks/browser/scoped_group_bookmark_actions.h"
26 #include "components/bookmarks/common/android/bookmark_type.h" 25 #include "components/bookmarks/common/android/bookmark_type.h"
27 #include "components/bookmarks/common/bookmark_pref_names.h" 26 #include "components/bookmarks/common/bookmark_pref_names.h"
28 #include "components/bookmarks/managed/managed_bookmark_service.h" 27 #include "components/bookmarks/managed/managed_bookmark_service.h"
28 #include "components/prefs/pref_service.h"
29 #include "components/query_parser/query_parser.h" 29 #include "components/query_parser/query_parser.h"
30 #include "components/signin/core/browser/signin_manager.h" 30 #include "components/signin/core/browser/signin_manager.h"
31 #include "components/undo/bookmark_undo_service.h" 31 #include "components/undo/bookmark_undo_service.h"
32 #include "components/undo/undo_manager.h" 32 #include "components/undo/undo_manager.h"
33 #include "content/public/browser/browser_thread.h" 33 #include "content/public/browser/browser_thread.h"
34 #include "grit/components_strings.h" 34 #include "grit/components_strings.h"
35 #include "jni/BookmarksBridge_jni.h" 35 #include "jni/BookmarksBridge_jni.h"
36 #include "ui/base/l10n/l10n_util.h" 36 #include "ui/base/l10n/l10n_util.h"
37 37
38 using base::android::AttachCurrentThread; 38 using base::android::AttachCurrentThread;
(...skipping 1065 matching lines...) Expand 10 before | Expand all | Expand 10 after
1104 BookmarkModelChanged(); 1104 BookmarkModelChanged();
1105 } 1105 }
1106 1106
1107 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) { 1107 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) {
1108 NotifyIfDoneLoading(); 1108 NotifyIfDoneLoading();
1109 } 1109 }
1110 1110
1111 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) { 1111 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) {
1112 partner_bookmarks_shim_ = NULL; 1112 partner_bookmarks_shim_ = NULL;
1113 } 1113 }
OLDNEW
« no previous file with comments | « chrome/browser/android/bookmarks/bookmarks_bridge.h ('k') | chrome/browser/android/bookmarks/partner_bookmarks_shim.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698