chrome/browser/android/bookmarks/bookmarks_bridge.cc - Issue 1090993003: Move undo files into //components/undo

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

Issue 1090993003: Move undo files into //components/undo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@utils

Patch Set: Fix gn compilation Created 5 years, 8 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

« no previous file with comments | « chrome/browser/DEPS ('k') | chrome/browser/bookmarks/bookmark_model_factory.cc » ('j') | no next file with comments »

OLD	NEW
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 "base/android/jni_array.h"	7 #include "base/android/jni_array.h"

8 #include "base/android/jni_string.h"	8 #include "base/android/jni_string.h"

9 #include "base/containers/stack_container.h"	9 #include "base/containers/stack_container.h"

10 #include "base/i18n/string_compare.h"	10 #include "base/i18n/string_compare.h"

11 #include "base/prefs/pref_service.h"	11 #include "base/prefs/pref_service.h"

12 #include "chrome/browser/bookmarks/bookmark_model_factory.h"	12 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

13 #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h"	13 #include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h"

14 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h"	14 #include "chrome/browser/bookmarks/enhanced_bookmarks_features.h"

15 #include "chrome/browser/profiles/incognito_helpers.h"	15 #include "chrome/browser/profiles/incognito_helpers.h"

16 #include "chrome/browser/profiles/profile.h"	16 #include "chrome/browser/profiles/profile.h"

17 #include "chrome/browser/profiles/profile_android.h"	17 #include "chrome/browser/profiles/profile_android.h"

18 #include "chrome/browser/signin/signin_manager_factory.h"	18 #include "chrome/browser/signin/signin_manager_factory.h"

19 #include "chrome/browser/undo/bookmark_undo_service.h"

20 #include "chrome/browser/undo/bookmark_undo_service_factory.h"	19 #include "chrome/browser/undo/bookmark_undo_service_factory.h"

21 #include "chrome/browser/undo/undo_manager.h"

22 #include "chrome/common/pref_names.h"	20 #include "chrome/common/pref_names.h"

23 #include "components/bookmarks/browser/bookmark_match.h"	21 #include "components/bookmarks/browser/bookmark_match.h"

24 #include "components/bookmarks/browser/bookmark_model.h"	22 #include "components/bookmarks/browser/bookmark_model.h"

25 #include "components/bookmarks/browser/bookmark_utils.h"	23 #include "components/bookmarks/browser/bookmark_utils.h"

26 #include "components/bookmarks/browser/scoped_group_bookmark_actions.h"	24 #include "components/bookmarks/browser/scoped_group_bookmark_actions.h"

27 #include "components/bookmarks/common/android/bookmark_type.h"	25 #include "components/bookmarks/common/android/bookmark_type.h"

28 #include "components/query_parser/query_parser.h"	26 #include "components/query_parser/query_parser.h"

29 #include "components/signin/core/browser/signin_manager.h"	27 #include "components/signin/core/browser/signin_manager.h"

	28 #include "components/undo/bookmark_undo_service.h"

	29 #include "components/undo/undo_manager.h"

30 #include "content/public/browser/browser_thread.h"	30 #include "content/public/browser/browser_thread.h"

31 #include "grit/components_strings.h"	31 #include "grit/components_strings.h"

32 #include "jni/BookmarksBridge_jni.h"	32 #include "jni/BookmarksBridge_jni.h"

33 #include "ui/base/l10n/l10n_util.h"	33 #include "ui/base/l10n/l10n_util.h"

34	34

35 using base::android::AttachCurrentThread;	35 using base::android::AttachCurrentThread;

36 using base::android::ConvertUTF8ToJavaString;	36 using base::android::ConvertUTF8ToJavaString;

37 using base::android::ConvertUTF16ToJavaString;	37 using base::android::ConvertUTF16ToJavaString;

38 using base::android::ScopedJavaLocalRef;	38 using base::android::ScopedJavaLocalRef;

39 using base::android::ScopedJavaGlobalRef;	39 using base::android::ScopedJavaGlobalRef;

(...skipping 994 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1034 BookmarkModelChanged();	1034 BookmarkModelChanged();

1035 }	1035 }

1036	1036

1037 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) {	1037 void BookmarksBridge::PartnerShimLoaded(PartnerBookmarksShim* shim) {

1038 NotifyIfDoneLoading();	1038 NotifyIfDoneLoading();

1039 }	1039 }

1040	1040

1041 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) {	1041 void BookmarksBridge::ShimBeingDeleted(PartnerBookmarksShim* shim) {

1042 partner_bookmarks_shim_ = NULL;	1042 partner_bookmarks_shim_ = NULL;

1043 }	1043 }

OLD	NEW