Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove Brave Ads TODO and rename browser/tab manager folders

Browse Source
This commit is contained in:
Terry Mancey
2022-06-06 15:19:58 -05:00
parent d134ce579e
commit 2848cd883b
29 changed files with 83 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/brave_ads/test/BUILD.gn
+2 -2
View File
@@ -124,7 +124,7 @@ source_set("brave_ads_unit_tests") {
"//brave/vendor/bat-native-ads/src/bat/ads/internal/base/unittest/unittest_url_response_util.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/base/unittest/unittest_url_response_util.h",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/base/url/url_util_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/browser_manager/browser_manager_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/browser/browser_manager_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/catalog/catalog_util_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/conversions/conversion_queue_database_table_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/conversions/conversion_queue_item_unittest_util.cc",
@@ -335,7 +335,7 @@ source_set("brave_ads_unit_tests") {
"//brave/vendor/bat-native-ads/src/bat/ads/internal/serving/targeting/user_model_builder_unittest_util.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/serving/targeting/user_model_builder_unittest_util.h",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/settings/settings_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/tab_manager/tab_manager_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/tabs/tab_manager_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/transfer/transfer_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/user_interaction/browsing/page_transition_util_unittest.cc",
"//brave/vendor/bat-native-ads/src/bat/ads/internal/user_interaction/browsing/user_activity_features_unittest.cc",
vendor/bat-native-ads/BUILD.gn
Vendored
+7 -7
View File
@@ -385,9 +385,9 @@ source_set("ads") {
"src/bat/ads/internal/base/url/url_response_string_util.h",
"src/bat/ads/internal/base/url/url_util.cc",
"src/bat/ads/internal/base/url/url_util.h",
"src/bat/ads/internal/browser_manager/browser_manager.cc",
"src/bat/ads/internal/browser_manager/browser_manager.h",
"src/bat/ads/internal/browser_manager/browser_manager_observer.h",
"src/bat/ads/internal/browser/browser_manager.cc",
"src/bat/ads/internal/browser/browser_manager.h",
"src/bat/ads/internal/browser/browser_manager_observer.h",
"src/bat/ads/internal/catalog/campaign/catalog_campaign_info.cc",
"src/bat/ads/internal/catalog/campaign/catalog_campaign_info.h",
"src/bat/ads/internal/catalog/campaign/catalog_campaign_info_aliases.h",
@@ -1033,10 +1033,10 @@ source_set("ads") {
"src/bat/ads/internal/settings/settings.h",
"src/bat/ads/internal/studies/studies_util.cc",
"src/bat/ads/internal/studies/studies_util.h",
"src/bat/ads/internal/tab_manager/tab_info.cc",
"src/bat/ads/internal/tab_manager/tab_info.h",
"src/bat/ads/internal/tab_manager/tab_manager.cc",
"src/bat/ads/internal/tab_manager/tab_manager.h",
"src/bat/ads/internal/tabs/tab_info.cc",
"src/bat/ads/internal/tabs/tab_info.h",
"src/bat/ads/internal/tabs/tab_manager.cc",
"src/bat/ads/internal/tabs/tab_manager.h",
"src/bat/ads/internal/transfer/transfer.cc",
"src/bat/ads/internal/transfer/transfer.h",
"src/bat/ads/internal/user_interaction/browsing/page_transition_util.cc",
vendor/bat-native-ads/src/bat/ads/internal/account/utility/redeem_unblinded_payment_tokens/redeem_unblinded_payment_tokens_unittest.cc
Vendored
+6 -6
View File
@@ -66,7 +66,7 @@ TEST_F(BatAdsRedeemUnblindedPaymentTokensTest, RedeemUnblindedPaymentTokens) {
)"}}}};
MockUrlRequest(ads_client_mock_, endpoints);
ads_client_mock_->SetTimePref(prefs::kNextTokenRedemptionAt, Now());
AdsClientHelper::Get()->SetTimePref(prefs::kNextTokenRedemptionAt, Now());
const privacy::UnblindedPaymentTokenList& unblinded_payment_tokens =
privacy::GetUnblindedPaymentTokens(1);
@@ -137,7 +137,7 @@ TEST_F(BatAdsRedeemUnblindedPaymentTokensTest,
)"}}}};
MockUrlRequest(ads_client_mock_, endpoints);
ads_client_mock_->SetTimePref(prefs::kNextTokenRedemptionAt, Now());
AdsClientHelper::Get()->SetTimePref(prefs::kNextTokenRedemptionAt, Now());
const privacy::UnblindedPaymentTokenList& unblinded_payment_tokens =
privacy::GetUnblindedPaymentTokens(1);
@@ -192,7 +192,7 @@ TEST_F(BatAdsRedeemUnblindedPaymentTokensTest, ScheduleNextTokenRedemption) {
)"}}}};
MockUrlRequest(ads_client_mock_, endpoints);
ads_client_mock_->SetTimePref(prefs::kNextTokenRedemptionAt, Now());
AdsClientHelper::Get()->SetTimePref(prefs::kNextTokenRedemptionAt, Now());
const privacy::UnblindedPaymentTokenList& unblinded_payment_tokens =
privacy::GetUnblindedPaymentTokens(1);
@@ -248,7 +248,7 @@ TEST_F(BatAdsRedeemUnblindedPaymentTokensTest, InvalidWallet) {
)"}}}};
MockUrlRequest(ads_client_mock_, endpoints);
ads_client_mock_->SetTimePref(prefs::kNextTokenRedemptionAt, Now());
AdsClientHelper::Get()->SetTimePref(prefs::kNextTokenRedemptionAt, Now());
const privacy::UnblindedPaymentTokenList& unblinded_payment_tokens =
privacy::GetUnblindedPaymentTokens(1);
@@ -304,7 +304,7 @@ TEST_F(BatAdsRedeemUnblindedPaymentTokensTest, NoUnblindedPaymentTokens) {
)"}}}};
MockUrlRequest(ads_client_mock_, endpoints);
ads_client_mock_->SetTimePref(prefs::kNextTokenRedemptionAt, Now());
AdsClientHelper::Get()->SetTimePref(prefs::kNextTokenRedemptionAt, Now());
// Act
EXPECT_CALL(*redeem_unblinded_payment_tokens_delegate_mock_,
@@ -356,7 +356,7 @@ TEST_F(BatAdsRedeemUnblindedPaymentTokensTest, Retry) {
)"}}}};
MockUrlRequest(ads_client_mock_, endpoints);
ads_client_mock_->SetTimePref(prefs::kNextTokenRedemptionAt, Now());
AdsClientHelper::Get()->SetTimePref(prefs::kNextTokenRedemptionAt, Now());
const privacy::UnblindedPaymentTokenList& unblinded_payment_tokens =
privacy::GetUnblindedPaymentTokens(1);
vendor/bat-native-ads/src/bat/ads/internal/ads_impl.cc
Vendored
+3 -3
View File
@@ -31,7 +31,7 @@
#include "bat/ads/internal/base/strings/string_strip_util.h"
#include "bat/ads/internal/base/time/time_formatting_util.h"
#include "bat/ads/internal/base/url/url_util.h"
#include "bat/ads/internal/browser_manager/browser_manager.h"
#include "bat/ads/internal/browser/browser_manager.h"
#include "bat/ads/internal/catalog/catalog.h"
#include "bat/ads/internal/catalog/catalog_info.h"
#include "bat/ads/internal/catalog/catalog_util.h"
@@ -66,8 +66,8 @@
#include "bat/ads/internal/serving/notification_ad_serving.h"
#include "bat/ads/internal/settings/settings.h"
#include "bat/ads/internal/studies/studies_util.h"
#include "bat/ads/internal/tab_manager/tab_info.h"
#include "bat/ads/internal/tab_manager/tab_manager.h"
#include "bat/ads/internal/tabs/tab_info.h"
#include "bat/ads/internal/tabs/tab_manager.h"
#include "bat/ads/internal/transfer/transfer.h"
#include "bat/ads/internal/user_interaction/browsing/user_activity_manager.h"
#include "bat/ads/internal/user_interaction/idle_detection/idle_time.h"
vendor/bat-native-ads/src/bat/ads/internal/base/unittest/unittest_base.h
Vendored
+2 -2
View File
@@ -15,13 +15,13 @@
#include "bat/ads/internal/ads_client_mock.h"
#include "bat/ads/internal/ads_impl.h"
#include "bat/ads/internal/base/platform/platform_helper_mock.h"
#include "bat/ads/internal/browser_manager/browser_manager.h"
#include "bat/ads/internal/browser/browser_manager.h"
#include "bat/ads/internal/covariates/covariate_manager.h"
#include "bat/ads/internal/database/database_manager.h"
#include "bat/ads/internal/deprecated/client/client_state_manager.h"
#include "bat/ads/internal/deprecated/confirmations/confirmation_state_manager.h"
#include "bat/ads/internal/diagnostics/diagnostic_manager.h"
#include "bat/ads/internal/tab_manager/tab_manager.h"
#include "bat/ads/internal/tabs/tab_manager.h"
#include "bat/ads/internal/user_interaction/browsing/user_activity_manager.h"
#include "brave/components/l10n/browser/locale_helper_mock.h"
#include "testing/gmock/include/gmock/gmock.h"
vendor/bat-native-ads/src/bat/ads/internal/browser_manager/browser_manager.cc → vendor/bat-native-ads/src/bat/ads/internal/browser/browser_manager.cc
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
* 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/. */
#include "bat/ads/internal/browser_manager/browser_manager.h"
#include "bat/ads/internal/browser/browser_manager.h"
#include "base/check_op.h"
#include "bat/ads/internal/base/logging_util.h"
vendor/bat-native-ads/src/bat/ads/internal/browser_manager/browser_manager.h → vendor/bat-native-ads/src/bat/ads/internal/browser/browser_manager.h
Vendored
+4 -4
View File
@@ -3,11 +3,11 @@
* 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/. */
#ifndef BRAVE_VENDOR_BAT_NATIVE_ADS_SRC_BAT_ADS_INTERNAL_BROWSER_MANAGER_BROWSER_MANAGER_H_
#define BRAVE_VENDOR_BAT_NATIVE_ADS_SRC_BAT_ADS_INTERNAL_BROWSER_MANAGER_BROWSER_MANAGER_H_
#ifndef BRAVE_VENDOR_BAT_NATIVE_ADS_SRC_BAT_ADS_INTERNAL_BROWSER_BROWSER_MANAGER_H_
#define BRAVE_VENDOR_BAT_NATIVE_ADS_SRC_BAT_ADS_INTERNAL_BROWSER_BROWSER_MANAGER_H_
#include "base/observer_list.h"
#include "bat/ads/internal/browser_manager/browser_manager_observer.h"
#include "bat/ads/internal/browser/browser_manager_observer.h"
namespace ads {
@@ -57,4 +57,4 @@ class BrowserManager final {
} // namespace ads
#endif // BRAVE_VENDOR_BAT_NATIVE_ADS_SRC_BAT_ADS_INTERNAL_BROWSER_MANAGER_BROWSER_MANAGER_H_
#endif // BRAVE_VENDOR_BAT_NATIVE_ADS_SRC_BAT_ADS_INTERNAL_BROWSER_BROWSER_MANAGER_H_
vendor/bat-native-ads/src/bat/ads/internal/browser_manager/browser_manager_observer.h → vendor/bat-native-ads/src/bat/ads/internal/browser/browser_manager_observer.h
Vendored
+3 -3
View File
@@ -3,8 +3,8 @@
* 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/. */
#ifndef BRAVE_VENDOR_BAT_NATIVE_ADS_SRC_BAT_ADS_INTERNAL_BROWSER_MANAGER_BROWSER_MANAGER_OBSERVER_H_
#define BRAVE_VENDOR_BAT_NATIVE_ADS_SRC_BAT_ADS_INTERNAL_BROWSER_MANAGER_BROWSER_MANAGER_OBSERVER_H_
#ifndef BRAVE_VENDOR_BAT_NATIVE_ADS_SRC_BAT_ADS_INTERNAL_BROWSER_BROWSER_MANAGER_OBSERVER_H_
#define BRAVE_VENDOR_BAT_NATIVE_ADS_SRC_BAT_ADS_INTERNAL_BROWSER_BROWSER_MANAGER_OBSERVER_H_
#include "base/observer_list_types.h"
@@ -30,4 +30,4 @@ class BrowserManagerObserver : public base::CheckedObserver {
} // namespace ads
#endif // BRAVE_VENDOR_BAT_NATIVE_ADS_SRC_BAT_ADS_INTERNAL_BROWSER_MANAGER_BROWSER_MANAGER_OBSERVER_H_
#endif // BRAVE_VENDOR_BAT_NATIVE_ADS_SRC_BAT_ADS_INTERNAL_BROWSER_BROWSER_MANAGER_OBSERVER_H_
vendor/bat-native-ads/src/bat/ads/internal/browser_manager/browser_manager_unittest.cc → vendor/bat-native-ads/src/bat/ads/internal/browser/browser_manager_unittest.cc
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
* 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/. */
#include "bat/ads/internal/browser_manager/browser_manager.h"
#include "bat/ads/internal/browser/browser_manager.h"
#include "bat/ads/internal/base/unittest/unittest_base.h"
vendor/bat-native-ads/src/bat/ads/internal/conversions/conversions_unittest.cc
Vendored
+2 -2
View File
@@ -56,8 +56,8 @@ class BatAdsConversionsTest : public UnitTestBase {
TEST_F(BatAdsConversionsTest, ShouldNotAllowConversionTracking) {
// Arrange
ads_client_mock_->SetBooleanPref(prefs::kShouldAllowConversionTracking,
false);
AdsClientHelper::Get()->SetBooleanPref(prefs::kShouldAllowConversionTracking,
false);
ConversionList conversions;
vendor/bat-native-ads/src/bat/ads/internal/covariates/covariate_manager.cc
Vendored
-2
View File
@@ -110,8 +110,6 @@ AverageClickthroughRateTimeWindows& GetAverageClickthroughRateTimeWindows() {
} // namespace
// TODO(https://github.com/brave/brave-browser/issues/22310): Refactor
// CovariateManager to Covariates
CovariateManager::CovariateManager() {
DCHECK(!g_covariate_logs_instance);
g_covariate_logs_instance = this;
vendor/bat-native-ads/src/bat/ads/internal/diagnostics/diagnostics_util.h
Vendored
+1 -1
View File
@@ -10,7 +10,7 @@
namespace base {
class Value;
}
} // namespace base
namespace ads {
vendor/bat-native-ads/src/bat/ads/internal/ml/pipeline/text_processing/text_processing.h
Vendored
+1 -1
View File
@@ -15,7 +15,7 @@
namespace base {
class Value;
}
} // namespace base
namespace ads {
namespace ml {
vendor/bat-native-ads/src/bat/ads/internal/serving/eligible_ads/exclusion_rules/conversion_exclusion_rule_unittest.cc
Vendored
+2 -2
View File
@@ -50,8 +50,8 @@ TEST_F(BatAdsConversionExclusionRuleTest, AllowAdIfThereIsNoConversionHistory) {
TEST_F(BatAdsConversionExclusionRuleTest,
DoNotAllowAdIfShouldNotAllowConversionTracking) {
// Arrange
ads_client_mock_->SetBooleanPref(prefs::kShouldAllowConversionTracking,
false);
AdsClientHelper::Get()->SetBooleanPref(prefs::kShouldAllowConversionTracking,
false);
CreativeAdInfo creative_ad;
creative_ad.creative_set_id = kCreativeSetIds.at(0);
vendor/bat-native-ads/src/bat/ads/internal/serving/eligible_ads/exclusion_rules/subdivision_targeting_exclusion_rule_unittest.cc
Vendored
+21 -14
View File
@@ -37,10 +37,11 @@ class BatAdsSubdivisionTargetingExclusionRuleTest : public UnitTestBase {
TEST_F(BatAdsSubdivisionTargetingExclusionRuleTest,
AllowAdIfSubdivisionTargetingIsSupportedAndAutoDetected) {
// Arrange
ads_client_mock_->SetStringPref(
AdsClientHelper::Get()->SetStringPref(
prefs::kAutoDetectedAdsSubdivisionTargetingCode, "US-FL");
ads_client_mock_->SetStringPref(prefs::kAdsSubdivisionTargetingCode, "AUTO");
AdsClientHelper::Get()->SetStringPref(prefs::kAdsSubdivisionTargetingCode,
"AUTO");
CreativeAdInfo creative_ad;
creative_ad.creative_set_id = kCreativeSetId;
@@ -56,7 +57,8 @@ TEST_F(BatAdsSubdivisionTargetingExclusionRuleTest,
TEST_F(BatAdsSubdivisionTargetingExclusionRuleTest,
AllowAdIfSubdivisionTargetingIsSupportedForMultipleGeoTargets) {
// Arrange
ads_client_mock_->SetStringPref(prefs::kAdsSubdivisionTargetingCode, "US-FL");
AdsClientHelper::Get()->SetStringPref(prefs::kAdsSubdivisionTargetingCode,
"US-FL");
CreativeAdInfo creative_ad;
creative_ad.creative_set_id = kCreativeSetId;
@@ -73,10 +75,11 @@ TEST_F(
BatAdsSubdivisionTargetingExclusionRuleTest,
AllowAdIfSubdivisionTargetingIsSupportedAndAutoDetectedForNonSubdivisionGeoTarget) { // NOLINT
// Arrange
ads_client_mock_->SetStringPref(
AdsClientHelper::Get()->SetStringPref(
prefs::kAutoDetectedAdsSubdivisionTargetingCode, "US-FL");
ads_client_mock_->SetStringPref(prefs::kAdsSubdivisionTargetingCode, "AUTO");
AdsClientHelper::Get()->SetStringPref(prefs::kAdsSubdivisionTargetingCode,
"AUTO");
CreativeAdInfo creative_ad;
creative_ad.creative_set_id = kCreativeSetId;
@@ -92,7 +95,8 @@ TEST_F(
TEST_F(BatAdsSubdivisionTargetingExclusionRuleTest,
AllowAdIfSubdivisionTargetingIsSupportedAndManuallySelected) {
// Arrange
ads_client_mock_->SetStringPref(prefs::kAdsSubdivisionTargetingCode, "US-FL");
AdsClientHelper::Get()->SetStringPref(prefs::kAdsSubdivisionTargetingCode,
"US-FL");
CreativeAdInfo creative_ad;
creative_ad.creative_set_id = kCreativeSetId;
@@ -109,7 +113,8 @@ TEST_F(
BatAdsSubdivisionTargetingExclusionRuleTest,
AllowAdIfSubdivisionTargetingIsSupportedAndManuallySelectedForNonSubdivisionGeoTarget) { // NOLINT
// Arrange
ads_client_mock_->SetStringPref(prefs::kAdsSubdivisionTargetingCode, "US-FL");
AdsClientHelper::Get()->SetStringPref(prefs::kAdsSubdivisionTargetingCode,
"US-FL");
CreativeAdInfo creative_ad;
creative_ad.creative_set_id = kCreativeSetId;
@@ -125,10 +130,11 @@ TEST_F(
TEST_F(BatAdsSubdivisionTargetingExclusionRuleTest,
DoNotAllowAdIfSubdivisionTargetingIsSupportedAndNotInitialized) {
// Arrange
ads_client_mock_->SetStringPref(
AdsClientHelper::Get()->SetStringPref(
prefs::kAutoDetectedAdsSubdivisionTargetingCode, "");
ads_client_mock_->SetStringPref(prefs::kAdsSubdivisionTargetingCode, "AUTO");
AdsClientHelper::Get()->SetStringPref(prefs::kAdsSubdivisionTargetingCode,
"AUTO");
CreativeAdInfo creative_ad;
creative_ad.creative_set_id = kCreativeSetId;
@@ -144,7 +150,8 @@ TEST_F(BatAdsSubdivisionTargetingExclusionRuleTest,
TEST_F(BatAdsSubdivisionTargetingExclusionRuleTest,
DoNotAllowAdIfSubdivisionTargetingIsSupportedForUnsupportedGeoTarget) {
// Arrange
ads_client_mock_->SetStringPref(prefs::kAdsSubdivisionTargetingCode, "US-FL");
AdsClientHelper::Get()->SetStringPref(prefs::kAdsSubdivisionTargetingCode,
"US-FL");
CreativeAdInfo creative_ad;
creative_ad.creative_set_id = kCreativeSetId;
@@ -193,8 +200,8 @@ TEST_F(BatAdsSubdivisionTargetingExclusionRuleTest,
TEST_F(BatAdsSubdivisionTargetingExclusionRuleTest,
DoNotAllowAdIfSubdivisionTargetingIsDisabledForSubdivisionGeoTarget) {
// Arrange
ads_client_mock_->SetStringPref(prefs::kAdsSubdivisionTargetingCode,
"DISABLED");
AdsClientHelper::Get()->SetStringPref(prefs::kAdsSubdivisionTargetingCode,
"DISABLED");
CreativeAdInfo creative_ad;
creative_ad.creative_set_id = kCreativeSetId;
@@ -210,8 +217,8 @@ TEST_F(BatAdsSubdivisionTargetingExclusionRuleTest,
TEST_F(BatAdsSubdivisionTargetingExclusionRuleTest,
AllowAdIfSubdivisionTargetingIsDisabledForNonSubdivisionGeoTarget) {
// Arrange
ads_client_mock_->SetStringPref(prefs::kAdsSubdivisionTargetingCode,
"DISABLED");
AdsClientHelper::Get()->SetStringPref(prefs::kAdsSubdivisionTargetingCode,
"DISABLED");
CreativeAdInfo creative_ad;
creative_ad.creative_set_id = kCreativeSetId;
vendor/bat-native-ads/src/bat/ads/internal/serving/permission_rules/browser_is_active_permission_rule.cc
Vendored
+1 -1
View File
@@ -6,7 +6,7 @@
#include "bat/ads/internal/serving/permission_rules/browser_is_active_permission_rule.h"
#include "bat/ads/internal/base/platform/platform_helper.h"
#include "bat/ads/internal/browser_manager/browser_manager.h"
#include "bat/ads/internal/browser/browser_manager.h"
#include "bat/ads/internal/serving/permission_rules/permission_rule_features.h"
namespace ads {
vendor/bat-native-ads/src/bat/ads/internal/serving/permission_rules/browser_is_active_permission_rule_unittest.cc
Vendored
+1 -1
View File
@@ -10,7 +10,7 @@
#include "base/test/scoped_feature_list.h"
#include "bat/ads/internal/base/unittest/unittest_base.h"
#include "bat/ads/internal/base/unittest/unittest_mock_util.h"
#include "bat/ads/internal/browser_manager/browser_manager.h"
#include "bat/ads/internal/browser/browser_manager.h"
#include "bat/ads/internal/serving/permission_rules/permission_rule_features.h"
// npm run test -- brave_unit_tests --filter=BatAds*
vendor/bat-native-ads/src/bat/ads/internal/serving/permission_rules/do_not_disturb_permission_rule.cc
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@
#include "base/check.h"
#include "base/time/time.h"
#include "bat/ads/internal/base/platform/platform_helper.h"
#include "bat/ads/internal/browser_manager/browser_manager.h"
#include "bat/ads/internal/browser/browser_manager.h"
namespace ads {
vendor/bat-native-ads/src/bat/ads/internal/serving/permission_rules/media_permission_rule.cc
Vendored
+2 -2
View File
@@ -6,8 +6,8 @@
#include "bat/ads/internal/serving/permission_rules/media_permission_rule.h"
#include "bat/ads/internal/serving/permission_rules/permission_rule_features.h"
#include "bat/ads/internal/tab_manager/tab_info.h"
#include "bat/ads/internal/tab_manager/tab_manager.h"
#include "bat/ads/internal/tabs/tab_info.h"
#include "bat/ads/internal/tabs/tab_manager.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
namespace ads {
vendor/bat-native-ads/src/bat/ads/internal/tab_manager/tab_info.cc → vendor/bat-native-ads/src/bat/ads/internal/tabs/tab_info.cc
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
* 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/. */
#include "bat/ads/internal/tab_manager/tab_info.h"
#include "bat/ads/internal/tabs/tab_info.h"
namespace ads {
vendor/bat-native-ads/src/bat/ads/internal/tab_manager/tab_info.h → vendor/bat-native-ads/src/bat/ads/internal/tabs/tab_info.h
Vendored
+3 -3
View File
@@ -3,8 +3,8 @@
* 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/. */
#ifndef BRAVE_VENDOR_BAT_NATIVE_ADS_SRC_BAT_ADS_INTERNAL_TAB_MANAGER_TAB_INFO_H_
#define BRAVE_VENDOR_BAT_NATIVE_ADS_SRC_BAT_ADS_INTERNAL_TAB_MANAGER_TAB_INFO_H_
#ifndef BRAVE_VENDOR_BAT_NATIVE_ADS_SRC_BAT_ADS_INTERNAL_TABS_TAB_INFO_H_
#define BRAVE_VENDOR_BAT_NATIVE_ADS_SRC_BAT_ADS_INTERNAL_TABS_TAB_INFO_H_
#include <cstdint>
@@ -28,4 +28,4 @@ struct TabInfo final {
} // namespace ads
#endif // BRAVE_VENDOR_BAT_NATIVE_ADS_SRC_BAT_ADS_INTERNAL_TAB_MANAGER_TAB_INFO_H_
#endif // BRAVE_VENDOR_BAT_NATIVE_ADS_SRC_BAT_ADS_INTERNAL_TABS_TAB_INFO_H_
vendor/bat-native-ads/src/bat/ads/internal/tab_manager/tab_manager.cc → vendor/bat-native-ads/src/bat/ads/internal/tabs/tab_manager.cc
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
* 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/. */
#include "bat/ads/internal/tab_manager/tab_manager.h"
#include "bat/ads/internal/tabs/tab_manager.h"
#include "base/check_op.h"
#include "bat/ads/internal/base/logging_util.h"
vendor/bat-native-ads/src/bat/ads/internal/tab_manager/tab_manager.h → vendor/bat-native-ads/src/bat/ads/internal/tabs/tab_manager.h
Vendored
+5 -5
View File
@@ -3,15 +3,15 @@
* 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/. */
#ifndef BRAVE_VENDOR_BAT_NATIVE_ADS_SRC_BAT_ADS_INTERNAL_TAB_MANAGER_TAB_MANAGER_H_
#define BRAVE_VENDOR_BAT_NATIVE_ADS_SRC_BAT_ADS_INTERNAL_TAB_MANAGER_TAB_MANAGER_H_
#ifndef BRAVE_VENDOR_BAT_NATIVE_ADS_SRC_BAT_ADS_INTERNAL_TABS_TAB_MANAGER_H_
#define BRAVE_VENDOR_BAT_NATIVE_ADS_SRC_BAT_ADS_INTERNAL_TABS_TAB_MANAGER_H_
#include <cstdint>
#include <map>
#include "base/observer_list.h"
#include "bat/ads/internal/tab_manager/tab_info.h"
#include "bat/ads/internal/tab_manager/tab_manager_observer.h"
#include "bat/ads/internal/tabs/tab_info.h"
#include "bat/ads/internal/tabs/tab_manager_observer.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
class GURL;
@@ -75,4 +75,4 @@ class TabManager final {
} // namespace ads
#endif // BRAVE_VENDOR_BAT_NATIVE_ADS_SRC_BAT_ADS_INTERNAL_TAB_MANAGER_TAB_MANAGER_H_
#endif // BRAVE_VENDOR_BAT_NATIVE_ADS_SRC_BAT_ADS_INTERNAL_TABS_TAB_MANAGER_H_
vendor/bat-native-ads/src/bat/ads/internal/tab_manager/tab_manager_observer.h → vendor/bat-native-ads/src/bat/ads/internal/tabs/tab_manager_observer.h
Vendored
+3 -3
View File
@@ -3,8 +3,8 @@
* 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/. */
#ifndef BRAVE_VENDOR_BAT_NATIVE_ADS_SRC_BAT_ADS_INTERNAL_TAB_MANAGER_TAB_MANAGER_OBSERVER_H_
#define BRAVE_VENDOR_BAT_NATIVE_ADS_SRC_BAT_ADS_INTERNAL_TAB_MANAGER_TAB_MANAGER_OBSERVER_H_
#ifndef BRAVE_VENDOR_BAT_NATIVE_ADS_SRC_BAT_ADS_INTERNAL_TABS_TAB_MANAGER_OBSERVER_H_
#define BRAVE_VENDOR_BAT_NATIVE_ADS_SRC_BAT_ADS_INTERNAL_TABS_TAB_MANAGER_OBSERVER_H_
#include <cstdint>
@@ -38,4 +38,4 @@ class TabManagerObserver : public base::CheckedObserver {
} // namespace ads
#endif // BRAVE_VENDOR_BAT_NATIVE_ADS_SRC_BAT_ADS_INTERNAL_TAB_MANAGER_TAB_MANAGER_OBSERVER_H_
#endif // BRAVE_VENDOR_BAT_NATIVE_ADS_SRC_BAT_ADS_INTERNAL_TABS_TAB_MANAGER_OBSERVER_H_
vendor/bat-native-ads/src/bat/ads/internal/tab_manager/tab_manager_unittest.cc → vendor/bat-native-ads/src/bat/ads/internal/tabs/tab_manager_unittest.cc
Vendored
+2 -2
View File
@@ -3,10 +3,10 @@
* 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/. */
#include "bat/ads/internal/tab_manager/tab_manager.h"
#include "bat/ads/internal/tabs/tab_manager.h"
#include "bat/ads/internal/base/unittest/unittest_base.h"
#include "bat/ads/internal/tab_manager/tab_info.h"
#include "bat/ads/internal/tabs/tab_info.h"
// npm run test -- brave_unit_tests --filter=BatAds*
vendor/bat-native-ads/src/bat/ads/internal/transfer/transfer.cc
Vendored
+2 -2
View File
@@ -11,8 +11,8 @@
#include "bat/ads/internal/ad_events/ad_events.h"
#include "bat/ads/internal/base/logging_util.h"
#include "bat/ads/internal/base/url/url_util.h"
#include "bat/ads/internal/tab_manager/tab_info.h"
#include "bat/ads/internal/tab_manager/tab_manager.h"
#include "bat/ads/internal/tabs/tab_info.h"
#include "bat/ads/internal/tabs/tab_manager.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
#include "url/gurl.h"
vendor/bat-native-ads/src/bat/ads/internal/transfer/transfer.h
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@
#include "base/observer_list.h"
#include "bat/ads/ad_info.h"
#include "bat/ads/internal/base/timer/timer.h"
#include "bat/ads/internal/tab_manager/tab_manager_observer.h"
#include "bat/ads/internal/tabs/tab_manager_observer.h"
#include "bat/ads/internal/transfer/transfer_observer.h"
namespace base {
vendor/bat-native-ads/src/bat/ads/internal/user_interaction/browsing/user_activity_manager.cc
Vendored
+2 -2
View File
@@ -12,8 +12,8 @@
#include "base/strings/string_number_conversions.h"
#include "base/time/time.h"
#include "bat/ads/internal/base/logging_util.h"
#include "bat/ads/internal/browser_manager/browser_manager.h"
#include "bat/ads/internal/tab_manager/tab_manager.h"
#include "bat/ads/internal/browser/browser_manager.h"
#include "bat/ads/internal/tabs/tab_manager.h"
#include "bat/ads/internal/user_interaction/browsing/page_transition_util.h"
#include "bat/ads/internal/user_interaction/browsing/user_activity_constants.h"
#include "bat/ads/internal/user_interaction/browsing/user_activity_features.h"
vendor/bat-native-ads/src/bat/ads/internal/user_interaction/browsing/user_activity_manager.h
Vendored
+2 -2
View File
@@ -8,8 +8,8 @@
#include <cstdint>
#include "bat/ads/internal/browser_manager/browser_manager_observer.h"
#include "bat/ads/internal/tab_manager/tab_manager_observer.h"
#include "bat/ads/internal/browser/browser_manager_observer.h"
#include "bat/ads/internal/tabs/tab_manager_observer.h"
#include "bat/ads/internal/user_interaction/browsing/user_activity_event_info_aliases.h"
#include "bat/ads/internal/user_interaction/browsing/user_activity_event_types.h"
#include "bat/ads/page_transition_types.h"