Unhide other bookmarks node

#3620
brave · Jan 28, 2020 · 1b51d3d · 1b51d3d
1 parent ce464a9
commit 1b51d3d
Show file tree

Hide file tree

Showing 13 changed files with 0 additions and 174 deletions.
diff --git a/browser/BUILD.gn b/browser/BUILD.gn
@@ -27,8 +27,6 @@ source_set("browser_process") {
     "autocomplete/brave_autocomplete_provider_client.h",
     "autocomplete/brave_autocomplete_scheme_classifier.cc",
     "autocomplete/brave_autocomplete_scheme_classifier.h",
-    "bookmarks/brave_bookmark_client.cc",
-    "bookmarks/brave_bookmark_client.h",
     "brave_rewards/rewards_tab_helper.cc",
     "brave_rewards/rewards_tab_helper.h",
     "brave_shields/ad_block_pref_service_factory.cc",

diff --git a/browser/bookmarks/brave_bookmark_client.cc b/browser/bookmarks/brave_bookmark_client.cc
diff --git a/browser/bookmarks/brave_bookmark_client.h b/browser/bookmarks/brave_bookmark_client.h
diff --git a/browser/bookmarks/brave_bookmark_client_browsertest.cc b/browser/bookmarks/brave_bookmark_client_browsertest.cc
diff --git a/browser/ui/BUILD.gn b/browser/ui/BUILD.gn
@@ -57,8 +57,6 @@ source_set("ui") {
       "bookmark/bookmark_prefs_service.h",
       "bookmark/bookmark_prefs_service_factory.cc",
       "bookmark/bookmark_prefs_service_factory.h",
-      "bookmark/recently_used_folders_combo_model.cc",
-      "bookmark/recently_used_folders_combo_model.h",
       "brave_browser_command_controller.cc",
       "brave_browser_command_controller.h",
       "brave_browser_content_setting_bubble_model_delegate.cc",

diff --git a/browser/ui/bookmark/recently_used_folders_combo_model.cc b/browser/ui/bookmark/recently_used_folders_combo_model.cc
diff --git a/browser/ui/bookmark/recently_used_folders_combo_model.h b/browser/ui/bookmark/recently_used_folders_combo_model.h
diff --git a/chromium_src/chrome/browser/bookmarks/bookmark_model_factory.cc b/chromium_src/chrome/browser/bookmarks/bookmark_model_factory.cc
@@ -7,6 +7,4 @@
 
 #define GetBrowserContextRedirectedInIncognito \
   GetBrowserContextRedirectedInIncognitoOverride
-#define ChromeBookmarkClient BraveBookmarkClient
 #include "../../../../../chrome/browser/bookmarks/bookmark_model_factory.cc"
-#undef ChromeBookmarkClient
diff --git a/chromium_src/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h b/chromium_src/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h
diff --git a/chromium_src/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chromium_src/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
diff --git a/patches/chrome-browser-ui-bookmarks-recently_used_folders_combo_model.h.patch b/patches/chrome-browser-ui-bookmarks-recently_used_folders_combo_model.h.patch
diff --git a/patches/chrome-browser-ui-views-bookmarks-bookmark_editor_view.cc.patch b/patches/chrome-browser-ui-views-bookmarks-bookmark_editor_view.cc.patch
diff --git a/test/BUILD.gn b/test/BUILD.gn
@@ -498,7 +498,6 @@ test("brave_browser_tests") {
     "//brave/browser/autocomplete/brave_autocomplete_provider_client_browsertest.cc",
     "//brave/browser/brave_scheme_load_browsertest.cc",
     "//brave/browser/autoplay/autoplay_permission_context_browsertest.cc",
-    "//brave/browser/bookmarks/brave_bookmark_client_browsertest.cc",
     "//brave/browser/brave_content_browser_client_browsertest.cc",
     "//brave/browser/brave_features_browsertest.cc",
     "//brave/browser/brave_profile_prefs_browsertest.cc",