-
Notifications
You must be signed in to change notification settings - Fork 888
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix brave/brave-browser#20500 Applied bookmark part of chromium's side panel to sidebar bookmark panel. sidebar.mojom is used for interacting between sidebar's bookmarks panel with SidebarBookmarksPageHandler. Most of webui impls in browser/resources/sidebar/bookmarks are copied from upstream and modified to show bookmark part only. (side panel's page shows read later and bookmark part both.) Bookmarks page uses custom context menu by asking to native via Sidebar:ShowCustomContextMenu interface.
- Loading branch information
Showing
42 changed files
with
1,811 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+680 Bytes
app/theme/default_100_percent/common/brave_bookmark_folder_open-lin-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+650 Bytes
app/theme/default_100_percent/common/brave_bookmark_folder_open-lin-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+623 Bytes
app/theme/default_100_percent/common/brave_bookmark_folder_open-win-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+623 Bytes
app/theme/default_100_percent/common/brave_bookmark_folder_open-win-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.62 KB
app/theme/default_200_percent/common/brave_bookmark_folder_open-lin-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.5 KB
app/theme/default_200_percent/common/brave_bookmark_folder_open-lin-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.44 KB
app/theme/default_200_percent/common/brave_bookmark_folder_open-win-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.44 KB
app/theme/default_200_percent/common/brave_bookmark_folder_open-win-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
# Copyright (c) 2022 The Brave Authors. All rights reserved. | ||
# This Source Code Form is subject to the terms of the Mozilla Public | ||
# License, v. 2.0. If a copy of the MPL was not distributed with this file, | ||
# You can obtain one at http://mozilla.org/MPL/2.0/. | ||
|
||
import("//chrome/common/features.gni") | ||
import("//tools/grit/grit_rule.gni") | ||
import("//ui/webui/resources/tools/generate_grd.gni") | ||
|
||
grit("resources") { | ||
defines = chrome_grit_defines | ||
defines += | ||
[ "SHARED_INTERMEDIATE_DIR=" + rebase_path(root_gen_dir, root_build_dir) ] | ||
|
||
enable_input_discovery_for_gn_analyze = false | ||
source = "$target_gen_dir/sidebar_resources.grd" | ||
deps = [ ":build_grd" ] | ||
|
||
outputs = [ | ||
"grit/sidebar_resources.h", | ||
"grit/sidebar_resources_map.cc", | ||
"grit/sidebar_resources_map.h", | ||
"sidebar_resources.pak", | ||
] | ||
output_dir = "$root_gen_dir/brave/browser/resources/sidebar" | ||
resource_ids = "//brave/browser/resources/resource_ids" | ||
} | ||
|
||
generate_grd("build_grd") { | ||
grdp_files = [ "$target_gen_dir/bookmarks/resources.grdp" ] | ||
deps = [ "bookmarks:build_grdp" ] | ||
grd_prefix = "sidebar" | ||
out_grd = "$target_gen_dir/${grd_prefix}_resources.grd" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,85 @@ | ||
# Copyright (c) 2022 The Brave Authors. All rights reserved. | ||
# This Source Code Form is subject to the terms of the Mozilla Public | ||
# License, v. 2.0. If a copy of the MPL was not distributed with this file, | ||
# You can obtain one at http://mozilla.org/MPL/2.0/. | ||
|
||
import("//tools/grit/preprocess_if_expr.gni") | ||
import("//tools/polymer/html_to_js.gni") | ||
import("//tools/typescript/ts_library.gni") | ||
import("//ui/webui/resources/tools/generate_grd.gni") | ||
|
||
preprocess_folder = | ||
"$root_gen_dir/brave/browser/resources/sidebar/bookmarks/preprocessed" | ||
|
||
generate_grd("build_grdp") { | ||
grd_prefix = "sidebar_bookmarks" | ||
out_grd = "$target_gen_dir/resources.grdp" | ||
deps = [ ":build_ts" ] | ||
manifest_files = [ | ||
"$root_gen_dir/brave/browser/resources/sidebar/bookmarks/tsconfig.manifest", | ||
] | ||
input_files = [ "bookmarks.html" ] | ||
input_files_base_dir = rebase_path(".", "//") | ||
} | ||
|
||
preprocess_if_expr("preprocess") { | ||
in_folder = "./" | ||
out_folder = preprocess_folder | ||
in_files = [ | ||
"bookmarks_api_proxy.ts", | ||
"bookmarks_drag_manager.ts", | ||
] | ||
} | ||
|
||
preprocess_if_expr("preprocess_generated") { | ||
deps = [ ":web_components" ] | ||
in_folder = target_gen_dir | ||
out_folder = preprocess_folder | ||
in_files = [ | ||
"bookmark_folder.ts", | ||
"bookmarks_list.ts", | ||
] | ||
} | ||
|
||
preprocess_if_expr("preprocess_mojo") { | ||
deps = [ "//brave/browser/ui/webui/sidebar:mojo_bindings_webui_js" ] | ||
in_folder = "$root_gen_dir/mojom-webui/brave/browser/ui/webui/sidebar/" | ||
out_folder = preprocess_folder | ||
out_manifest = "$target_gen_dir/preprocessed_mojo_manifest.json" | ||
in_files = [ "sidebar.mojom-webui.js" ] | ||
} | ||
|
||
html_to_js("web_components") { | ||
js_files = [ | ||
"bookmark_folder.ts", | ||
"bookmarks_list.ts", | ||
] | ||
} | ||
|
||
ts_library("build_ts") { | ||
tsconfig_base = "tsconfig_base.json" | ||
root_dir = "$target_gen_dir/preprocessed" | ||
out_dir = "$target_gen_dir/tsc" | ||
in_files = [ | ||
"bookmark_folder.ts", | ||
"bookmarks_list.ts", | ||
"bookmarks_api_proxy.ts", | ||
"bookmarks_drag_manager.ts", | ||
"sidebar.mojom-webui.js", | ||
] | ||
definitions = [ | ||
"//tools/typescript/definitions/bookmark_manager_private.d.ts", | ||
"//tools/typescript/definitions/bookmarks.d.ts", | ||
"//tools/typescript/definitions/chrome_event.d.ts", | ||
] | ||
deps = [ | ||
"//third_party/polymer/v3_0:library", | ||
"//ui/webui/resources:library", | ||
"//ui/webui/resources/mojo:library", | ||
] | ||
extra_deps = [ | ||
":preprocess", | ||
":preprocess_generated", | ||
":preprocess_mojo", | ||
] | ||
} |
Oops, something went wrong.