Skip to content

Commit

Permalink
Cl-formatted changed files.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mkarolin
mkarolin committed Dec 12, 2020
1 parent fb1e34c commit 2933f14
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 23 deletions.
37 changes: 16 additions & 21 deletions browser/ui/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import("//brave/components/ipfs/buildflags/buildflags.gni")
import("//brave/components/speedreader/buildflags.gni")
import("//brave/components/tor/buildflags/buildflags.gni")
import("//build/config/features.gni")
import("//components/gcm_driver/config.gni")
import("//chrome/common/features.gni")
import("//components/gcm_driver/config.gni")

source_set("favicon_source") {
# Remove when https://github.com/brave/brave-browser/issues/10614 is resolved
Expand Down Expand Up @@ -36,12 +36,12 @@ source_set("ui") {
"webui/basic_ui.h",
"webui/brave_adblock_ui.cc",
"webui/brave_adblock_ui.h",
"webui/webcompat_reporter_ui.cc",
"webui/webcompat_reporter_ui.h",
"webui/brave_web_ui_controller_factory.cc",
"webui/brave_web_ui_controller_factory.h",
"webui/brave_webui_source.cc",
"webui/brave_webui_source.h",
"webui/webcompat_reporter_ui.cc",
"webui/webcompat_reporter_ui.h",
]

if (ipfs_enabled) {
Expand Down Expand Up @@ -73,9 +73,9 @@ source_set("ui") {
"content_settings/brave_content_setting_image_models.h",
"omnibox/brave_omnibox_client_impl.cc",
"omnibox/brave_omnibox_client_impl.h",
"toolbar/brave_recent_tabs_sub_menu_model.h",
"toolbar/brave_app_menu_model.cc",
"toolbar/brave_app_menu_model.h",
"toolbar/brave_recent_tabs_sub_menu_model.h",
"webui/brave_settings_ui.cc",
"webui/brave_settings_ui.h",
"webui/brave_welcome_ui.cc",
Expand All @@ -100,13 +100,9 @@ source_set("ui") {
]

if (is_mac) {
sources += [
"webui/settings/brave_import_data_handler_mac.mm",
]
sources += [ "webui/settings/brave_import_data_handler_mac.mm" ]
} else {
sources += [
"webui/settings/brave_import_data_handler.cc",
]
sources += [ "webui/settings/brave_import_data_handler.cc" ]
}

if (enable_sparkle) {
Expand Down Expand Up @@ -170,8 +166,8 @@ source_set("ui") {

if (is_mac) {
sources += [
"views/frame/brave_browser_non_client_frame_view_mac.mm",
"views/frame/brave_browser_non_client_frame_view_mac.h",
"views/frame/brave_browser_non_client_frame_view_mac.mm",
]
}
}
Expand Down Expand Up @@ -211,29 +207,30 @@ source_set("ui") {
"//brave/browser/gcm_driver",
"//brave/browser/profiles",
"//brave/browser/tor",

# //chrome/browser/ui depends on //brave/browser/ui, add this target here
# to pull in dependencies needed for the overwrite codes in chromium_src.
"//brave/chromium_src/chrome/browser/ui",
"//brave/common",
"//brave/common:pref_names",
"//brave/components/brave_adblock_ui:generated_resources",
"//brave/components/webcompat_reporter/ui:generated_resources",
"//brave/components/brave_ads/browser",
"//brave/components/brave_rewards/browser",
"//brave/components/brave_rewards/resources",
"//brave/components/brave_shields/browser",
"//brave/components/brave_wallet/buildflags:buildflags",
"//brave/components/brave_wayback_machine:buildflags",
"//brave/components/crypto_dot_com/browser/buildflags:buildflags",
"//brave/components/l10n/browser",
"//brave/components/l10n/common",
"//brave/components/crypto_dot_com/browser/buildflags:buildflags",
"//brave/components/ntp_background_images/browser",
"//brave/components/ntp_background_images/common",
"//brave/components/ntp_widget_utils/browser",
"//brave/components/p3a:buildflags",
"//brave/components/tor:pref_names",
"//brave/components/vector_icons",
"//brave/components/webcompat_reporter/browser",
"//brave/components/webcompat_reporter/ui:generated_resources",
"//brave/components/weekly_storage",
"//brave/ui/brave_ads",
"//brave/ui/brave_ads/public/cpp",
Expand All @@ -259,9 +256,7 @@ source_set("ui") {
# This is no longer compiled into Chromium on Android, but we still
# need it
if (is_android) {
deps += [
":favicon_source",
]
deps += [ ":favicon_source" ]
}

if (enable_brave_wayback_machine) {
Expand All @@ -285,9 +280,9 @@ source_set("ui") {
"//brave/browser:version_info",
"//brave/browser/resources/settings:resources",
"//brave/browser/ui/bookmark",
"//brave/components/brave_new_tab_ui:generated_resources",
"//brave/components/brave_sync",
"//brave/components/brave_sync:profile_sync_service_helper",
"//brave/components/brave_new_tab_ui:generated_resources",
"//brave/components/brave_welcome_ui:generated_resources",
"//chrome/app:chromium_strings",
"//components/sync_device_info",
Expand Down Expand Up @@ -345,10 +340,10 @@ source_set("ui") {
}

deps += [
"//brave/browser/extensions",
"//brave/browser/resources/extensions:resources",
"//brave/components/brave_extension:generated_resources",
"//brave/components/brave_extension:static_resources",
"//brave/browser/extensions",
"//chrome/browser/extensions",
"//components/sessions",
"//extensions/browser",
Expand All @@ -368,10 +363,10 @@ source_set("ui") {
sources += [
"webui/brave_rewards_internals_ui.cc",
"webui/brave_rewards_internals_ui.h",
"webui/brave_rewards_source.cc",
"webui/brave_rewards_source.h",
"webui/brave_rewards_page_ui.cc",
"webui/brave_rewards_page_ui.h",
"webui/brave_rewards_source.cc",
"webui/brave_rewards_source.h",
]

if (!is_android) {
Expand All @@ -382,8 +377,8 @@ source_set("ui") {
}

deps += [
"//brave/components/brave_rewards/resources:page_generated_resources",
"//brave/components/brave_rewards/resources:internals_generated_resources",
"//brave/components/brave_rewards/resources:page_generated_resources",
"//brave/components/brave_rewards/resources:tip_generated_resources",
"//brave/vendor/bat-native-ledger:headers",
]
Expand Down
6 changes: 4 additions & 2 deletions browser/ui/webui/brave_webui_source.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
#include <map>
#include <vector>

#include "brave/components/crypto_dot_com/browser/buildflags/buildflags.h"
#include "brave/components/ipfs/buildflags/buildflags.h"
#include "base/strings/utf_string_conversions.h"
#include "brave/common/url_constants.h"
#include "brave/components/crypto_dot_com/browser/buildflags/buildflags.h"
#include "brave/components/ipfs/buildflags/buildflags.h"
#include "components/grit/brave_components_resources.h"
#include "components/grit/brave_components_strings.h"
#include "components/grit/components_resources.h"
Expand Down Expand Up @@ -100,6 +100,7 @@ void CustomizeWebUIHTMLSource(const std::string &name,
};
AddResourcePaths(source, resources[name]);

// clang-format off
static std::map<std::string, std::vector<WebUISimpleItem> >
localized_strings = {
{
Expand Down Expand Up @@ -977,5 +978,6 @@ void CustomizeWebUIHTMLSource(const std::string &name,
}
}
};
// clang-format on
AddLocalizedStringsBulk(source, localized_strings[name]);
} // NOLINT(readability/fn_size)

0 comments on commit 2933f14

Please sign in to comment.