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

[cr145][Android] Replace JavaParamRef -> JavaRef

Browse Source 
Chromium changes:
https://chromium.googlesource.com/chromium/src/+/0d6ec7e0f328e9ddd6f5174f61676ff85c777af6

commit 0d6ec7e0f328e9ddd6f5174f61676ff85c777af6
Author: Andrew Grieve <agrieve@chromium.org>
Date:   Tue Dec 2 12:37:02 2025 -0800

    Android: Replace JavaParamRef -> JavaRef (part 5)

    JavaParamRef used to be different, but now is an alias for JavaRef.

    Bug: 40173007
    Change-Id: I9bfa2fcdd012fc90859886ee2e747cb360733421
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7217772
    Commit-Queue: Andrew Grieve <agrieve@chromium.org>
    Owners-Override: Andrew Grieve <agrieve@chromium.org>
    Reviewed-by: Martin Kong <martinkong@google.com>
    Cr-Commit-Position: refs/heads/main@{#1553033}
This commit is contained in:
Artem Samoilenko
2026-01-29 13:40:24 -05:00
committed by Max Karolinskiy
parent 03f3c5219b
commit 79cb1bbb57
48 changed files with 290 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
browser/ai_chat/ai_chat_settings_helper.cc
+1 -1
View File
@@ -196,7 +196,7 @@ void AIChatSettingsHelper::BindInterface(
#if BUILDFLAG(IS_ANDROID)
static jlong JNI_BraveLeoMojomHelper_Init(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& jbrowser_context_handle) {
const base::android::JavaRef<jobject>& jbrowser_context_handle) {
content::BrowserContext* browser_context =
content::BrowserContextFromJavaHandle(jbrowser_context_handle);
AIChatSettingsHelper* settings_helper =
browser/ai_chat/android/ai_chat_utils_android.cc
+4 -4
View File
@@ -22,9 +22,9 @@ namespace ai_chat {
static void JNI_BraveLeoUtils_OpenLeoQuery(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& jweb_contents,
const base::android::JavaParamRef<jstring>& conversation_uuid,
const base::android::JavaParamRef<jstring>& query) {
const base::android::JavaRef<jobject>& jweb_contents,
const base::android::JavaRef<jstring>& conversation_uuid,
const base::android::JavaRef<jstring>& query) {
content::WebContents* web_contents =
content::WebContents::FromJavaWebContents(jweb_contents);
AIChatService* ai_chat_service = AIChatServiceFactory::GetForBrowserContext(
@@ -68,7 +68,7 @@ static void JNI_BraveLeoUtils_OpenLeoQuery(
static void JNI_BraveLeoUtils_OpenLeoUrlForTab(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& jweb_contents) {
const base::android::JavaRef<jobject>& jweb_contents) {
content::WebContents* web_contents =
content::WebContents::FromJavaWebContents(jweb_contents);
AIChatService* ai_chat_service = AIChatServiceFactory::GetForBrowserContext(
browser/android/brave_feature_util.cc
+1 -1
View File
@@ -35,7 +35,7 @@ int GetNumberOfOptions(const std::string& internal_name) {
static void JNI_BraveFeatureUtil_EnableFeature(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& featureName,
const base::android::JavaRef<jstring>& featureName,
jboolean enabled,
jboolean fallback_to_default) {
std::string feature_name =
browser/android/brave_shields_content_settings.cc
+67 -56
View File
@@ -34,8 +34,9 @@ namespace android {
// That class is linked to a global toolbar. It's a one instance on Android
BraveShieldsContentSettings* g_brave_shields_content_settings = nullptr;
static void JNI_BraveShieldsContentSettings_Init(JNIEnv* env,
const base::android::JavaParamRef<jobject>& jcaller) {
static void JNI_BraveShieldsContentSettings_Init(
JNIEnv* env,
const base::android::JavaRef<jobject>& jcaller) {
g_brave_shields_content_settings =
new BraveShieldsContentSettings(env, jcaller);
}
@@ -90,10 +91,11 @@ void BraveShieldsContentSettings::DispatchBlockedEvent(int tab_id,
block_type, subresource);
}
void JNI_BraveShieldsContentSettings_SetBraveShieldsEnabled(JNIEnv* env,
void JNI_BraveShieldsContentSettings_SetBraveShieldsEnabled(
JNIEnv* env,
jboolean enabled,
const base::android::JavaParamRef<jstring>& url,
const base::android::JavaParamRef<jobject>& j_profile) {
const base::android::JavaRef<jstring>& url,
const base::android::JavaRef<jobject>& j_profile) {
brave_shields::SetBraveShieldsEnabled(
HostContentSettingsMapFactory::GetForProfile(
Profile::FromJavaObject(j_profile)),
@@ -101,19 +103,21 @@ void JNI_BraveShieldsContentSettings_SetBraveShieldsEnabled(JNIEnv* env,
g_browser_process->local_state());
}
jboolean JNI_BraveShieldsContentSettings_GetBraveShieldsEnabled(JNIEnv* env,
const base::android::JavaParamRef<jstring>& url,
const base::android::JavaParamRef<jobject>& j_profile) {
jboolean JNI_BraveShieldsContentSettings_GetBraveShieldsEnabled(
JNIEnv* env,
const base::android::JavaRef<jstring>& url,
const base::android::JavaRef<jobject>& j_profile) {
return brave_shields::GetBraveShieldsEnabled(
HostContentSettingsMapFactory::GetForProfile(
Profile::FromJavaObject(j_profile)),
GURL(base::android::ConvertJavaStringToUTF8(env, url)));
}
void JNI_BraveShieldsContentSettings_SetAdControlType(JNIEnv* env,
const base::android::JavaParamRef<jstring>& type,
const base::android::JavaParamRef<jstring>& url,
const base::android::JavaParamRef<jobject>& j_profile) {
void JNI_BraveShieldsContentSettings_SetAdControlType(
JNIEnv* env,
const base::android::JavaRef<jstring>& type,
const base::android::JavaRef<jstring>& url,
const base::android::JavaRef<jobject>& j_profile) {
brave_shields::SetAdControlType(
HostContentSettingsMapFactory::GetForProfile(
Profile::FromJavaObject(j_profile)),
@@ -124,9 +128,10 @@ void JNI_BraveShieldsContentSettings_SetAdControlType(JNIEnv* env,
}
base::android::ScopedJavaLocalRef<jstring>
JNI_BraveShieldsContentSettings_GetAdControlType(JNIEnv* env,
const base::android::JavaParamRef<jstring>& url,
const base::android::JavaParamRef<jobject>& j_profile) {
JNI_BraveShieldsContentSettings_GetAdControlType(
JNIEnv* env,
const base::android::JavaRef<jstring>& url,
const base::android::JavaRef<jobject>& j_profile) {
brave_shields::ControlType control_type = brave_shields::GetAdControlType(
HostContentSettingsMapFactory::GetForProfile(
Profile::FromJavaObject(j_profile)),
@@ -136,10 +141,11 @@ base::android::ScopedJavaLocalRef<jstring>
brave_shields::ControlTypeToString(control_type));
}
void JNI_BraveShieldsContentSettings_SetCookieControlType(JNIEnv* env,
const base::android::JavaParamRef<jstring>& type,
const base::android::JavaParamRef<jstring>& url,
const base::android::JavaParamRef<jobject>& j_profile) {
void JNI_BraveShieldsContentSettings_SetCookieControlType(
JNIEnv* env,
const base::android::JavaRef<jstring>& type,
const base::android::JavaRef<jstring>& url,
const base::android::JavaRef<jobject>& j_profile) {
brave_shields::SetCookieControlType(
HostContentSettingsMapFactory::GetForProfile(
Profile::FromJavaObject(j_profile)),
@@ -152,9 +158,9 @@ void JNI_BraveShieldsContentSettings_SetCookieControlType(JNIEnv* env,
void JNI_BraveShieldsContentSettings_SetCosmeticFilteringControlType(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& type,
const base::android::JavaParamRef<jstring>& url,
const base::android::JavaParamRef<jobject>& j_profile) {
const base::android::JavaRef<jstring>& type,
const base::android::JavaRef<jstring>& url,
const base::android::JavaRef<jobject>& j_profile) {
brave_shields::SetCosmeticFilteringControlType(
HostContentSettingsMapFactory::GetForProfile(
Profile::FromJavaObject(j_profile)),
@@ -167,23 +173,24 @@ void JNI_BraveShieldsContentSettings_SetCosmeticFilteringControlType(
void JNI_BraveShieldsContentSettings_ResetCosmeticFilter(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& url) {
const base::android::JavaRef<jstring>& url) {
g_brave_browser_process->ad_block_service()->ResetCosmeticFilter(
GURL(base::android::ConvertJavaStringToUTF8(env, url)).host());
}
jboolean JNI_BraveShieldsContentSettings_AreAnyBlockedElementsPresent(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& url) {
const base::android::JavaRef<jstring>& url) {
return g_brave_browser_process->ad_block_service()
->AreAnyBlockedElementsPresent(
GURL(base::android::ConvertJavaStringToUTF8(env, url)).host());
}
base::android::ScopedJavaLocalRef<jstring>
JNI_BraveShieldsContentSettings_GetCookieControlType(JNIEnv* env,
const base::android::JavaParamRef<jstring>& url,
const base::android::JavaParamRef<jobject>& j_profile) {
JNI_BraveShieldsContentSettings_GetCookieControlType(
JNIEnv* env,
const base::android::JavaRef<jstring>& url,
const base::android::JavaRef<jobject>& j_profile) {
brave_shields::ControlType control_type = brave_shields::GetCookieControlType(
HostContentSettingsMapFactory::GetForProfile(
Profile::FromJavaObject(j_profile)),
@@ -195,10 +202,11 @@ base::android::ScopedJavaLocalRef<jstring>
brave_shields::ControlTypeToString(control_type));
}
void JNI_BraveShieldsContentSettings_SetFingerprintingControlType(JNIEnv* env,
const base::android::JavaParamRef<jstring>& type,
const base::android::JavaParamRef<jstring>& url,
const base::android::JavaParamRef<jobject>& j_profile) {
void JNI_BraveShieldsContentSettings_SetFingerprintingControlType(
JNIEnv* env,
const base::android::JavaRef<jstring>& type,
const base::android::JavaRef<jstring>& url,
const base::android::JavaRef<jobject>& j_profile) {
brave_shields::SetFingerprintingControlType(
HostContentSettingsMapFactory::GetForProfile(
Profile::FromJavaObject(j_profile)),
@@ -210,9 +218,10 @@ void JNI_BraveShieldsContentSettings_SetFingerprintingControlType(JNIEnv* env,
}
base::android::ScopedJavaLocalRef<jstring>
JNI_BraveShieldsContentSettings_GetFingerprintingControlType(JNIEnv* env,
const base::android::JavaParamRef<jstring>& url,
const base::android::JavaParamRef<jobject>& j_profile) {
JNI_BraveShieldsContentSettings_GetFingerprintingControlType(
JNIEnv* env,
const base::android::JavaRef<jstring>& url,
const base::android::JavaRef<jobject>& j_profile) {
brave_shields::ControlType control_type =
brave_shields::GetFingerprintingControlType(
HostContentSettingsMapFactory::GetForProfile(
@@ -225,9 +234,9 @@ base::android::ScopedJavaLocalRef<jstring>
void JNI_BraveShieldsContentSettings_SetHttpsUpgradeControlType(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& type,
const base::android::JavaParamRef<jstring>& url,
const base::android::JavaParamRef<jobject>& j_profile) {
const base::android::JavaRef<jstring>& type,
const base::android::JavaRef<jstring>& url,
const base::android::JavaRef<jobject>& j_profile) {
brave_shields::SetHttpsUpgradeControlType(
HostContentSettingsMapFactory::GetForProfile(
Profile::FromJavaObject(j_profile)),
@@ -240,8 +249,8 @@ void JNI_BraveShieldsContentSettings_SetHttpsUpgradeControlType(
base::android::ScopedJavaLocalRef<jstring>
JNI_BraveShieldsContentSettings_GetHttpsUpgradeControlType(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& url,
const base::android::JavaParamRef<jobject>& j_profile) {
const base::android::JavaRef<jstring>& url,
const base::android::JavaRef<jobject>& j_profile) {
brave_shields::ControlType control_type =
brave_shields::GetHttpsUpgradeControlType(
HostContentSettingsMapFactory::GetForProfile(
@@ -255,8 +264,8 @@ JNI_BraveShieldsContentSettings_GetHttpsUpgradeControlType(
base::android::ScopedJavaLocalRef<jstring>
JNI_BraveShieldsContentSettings_GetCosmeticFilteringControlType(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& url,
const base::android::JavaParamRef<jobject>& j_profile) {
const base::android::JavaRef<jstring>& url,
const base::android::JavaRef<jobject>& j_profile) {
brave_shields::ControlType cosmetic_type =
brave_shields::GetCosmeticFilteringControlType(
HostContentSettingsMapFactory::GetForProfile(
@@ -267,10 +276,11 @@ JNI_BraveShieldsContentSettings_GetCosmeticFilteringControlType(
env, brave_shields::ControlTypeToString(cosmetic_type));
}
void JNI_BraveShieldsContentSettings_SetNoScriptControlType(JNIEnv* env,
const base::android::JavaParamRef<jstring>& type,
const base::android::JavaParamRef<jstring>& url,
const base::android::JavaParamRef<jobject>& j_profile) {
void JNI_BraveShieldsContentSettings_SetNoScriptControlType(
JNIEnv* env,
const base::android::JavaRef<jstring>& type,
const base::android::JavaRef<jstring>& url,
const base::android::JavaRef<jobject>& j_profile) {
brave_shields::SetNoScriptControlType(
HostContentSettingsMapFactory::GetForProfile(
Profile::FromJavaObject(j_profile)),
@@ -281,9 +291,10 @@ void JNI_BraveShieldsContentSettings_SetNoScriptControlType(JNIEnv* env,
}
base::android::ScopedJavaLocalRef<jstring>
JNI_BraveShieldsContentSettings_GetNoScriptControlType(JNIEnv* env,
const base::android::JavaParamRef<jstring>& url,
const base::android::JavaParamRef<jobject>& j_profile) {
JNI_BraveShieldsContentSettings_GetNoScriptControlType(
JNIEnv* env,
const base::android::JavaRef<jstring>& url,
const base::android::JavaRef<jobject>& j_profile) {
brave_shields::ControlType control_type =
brave_shields::GetNoScriptControlType(
HostContentSettingsMapFactory::GetForProfile(
@@ -297,8 +308,8 @@ base::android::ScopedJavaLocalRef<jstring>
void JNI_BraveShieldsContentSettings_SetForgetFirstPartyStorageEnabled(
JNIEnv* env,
jboolean enabled,
const base::android::JavaParamRef<jstring>& url,
const base::android::JavaParamRef<jobject>& j_profile) {
const base::android::JavaRef<jstring>& url,
const base::android::JavaRef<jobject>& j_profile) {
auto* brave_shields_settings =
BraveShieldsSettingsServiceFactory::GetForProfile(
Profile::FromJavaObject(j_profile));
@@ -308,8 +319,8 @@ void JNI_BraveShieldsContentSettings_SetForgetFirstPartyStorageEnabled(
jboolean JNI_BraveShieldsContentSettings_GetForgetFirstPartyStorageEnabled(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& url,
const base::android::JavaParamRef<jobject>& j_profile) {
const base::android::JavaRef<jstring>& url,
const base::android::JavaRef<jobject>& j_profile) {
auto* brave_shields_settings =
BraveShieldsSettingsServiceFactory::GetForProfile(
Profile::FromJavaObject(j_profile));
@@ -334,8 +345,8 @@ void JNI_BraveShieldsContentSettings_SetAllowElementBlockerInPrivateModeEnabled(
void JNI_BraveShieldsContentSettings_SetAutoShredMode(
JNIEnv* env,
jint mode,
const base::android::JavaParamRef<jstring>& url,
const base::android::JavaParamRef<jobject>& j_profile) {
const base::android::JavaRef<jstring>& url,
const base::android::JavaRef<jobject>& j_profile) {
std::optional<brave_shields::mojom::AutoShredMode> maybe_mode =
brave_shields::traits::SettingTraits<
brave_shields::mojom::AutoShredMode>::From(mode);
@@ -351,8 +362,8 @@ void JNI_BraveShieldsContentSettings_SetAutoShredMode(
jint JNI_BraveShieldsContentSettings_GetAutoShredMode(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& url,
const base::android::JavaParamRef<jobject>& j_profile) {
const base::android::JavaRef<jstring>& url,
const base::android::JavaRef<jobject>& j_profile) {
auto* brave_shields_settings =
BraveShieldsSettingsServiceFactory::GetForProfile(
Profile::FromJavaObject(j_profile));
browser/android/brave_sync_worker.cc
+14 -14
View File
@@ -82,7 +82,7 @@ base::android::ScopedJavaLocalRef<jstring> BraveSyncWorker::GetSyncCodeWords(
void BraveSyncWorker::SaveCodeWords(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& passphrase) {
const base::android::JavaRef<jstring>& passphrase) {
std::string str_passphrase =
base::android::ConvertJavaStringToUTF8(passphrase);
@@ -257,7 +257,7 @@ void NativePermanentlyDeleteAccountCallback(
void BraveSyncWorker::PermanentlyDeleteAccount(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& callback) {
const base::android::JavaRef<jobject>& callback) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
auto* sync_service = GetSyncService();
CHECK_NE(sync_service, nullptr);
@@ -293,7 +293,7 @@ void NativeJoinSyncChainCallback(
void BraveSyncWorker::SetJoinSyncChainCallback(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& callback) {
const base::android::JavaRef<jobject>& callback) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
auto* sync_service = GetSyncService();
CHECK_NE(sync_service, nullptr);
@@ -321,14 +321,14 @@ bool BraveSyncWorker::IsAccountDeletedNoticePending(JNIEnv* env) {
static void JNI_BraveSyncWorker_Init(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& jcaller) {
const base::android::JavaRef<jobject>& jcaller) {
new BraveSyncWorker(env, jcaller);
}
static base::android::ScopedJavaLocalRef<jstring>
JNI_BraveSyncWorker_GetSeedHexFromWords(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& seed_words) {
const base::android::JavaRef<jstring>& seed_words) {
std::string str_seed_words =
base::android::ConvertJavaStringToUTF8(seed_words);
DCHECK(!str_seed_words.empty());
@@ -372,7 +372,7 @@ std::string GetWordsFromSeedHex(const std::string& str_seed_hex) {
static base::android::ScopedJavaLocalRef<jstring>
JNI_BraveSyncWorker_GetWordsFromSeedHex(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& seed_hex) {
const base::android::JavaRef<jstring>& seed_hex) {
std::string str_seed_hex = base::android::ConvertJavaStringToUTF8(seed_hex);
std::string sync_code_words = GetWordsFromSeedHex(str_seed_hex);
return ConvertUTF8ToJavaString(env, sync_code_words);
@@ -381,7 +381,7 @@ JNI_BraveSyncWorker_GetWordsFromSeedHex(
static base::android::ScopedJavaLocalRef<jstring>
JNI_BraveSyncWorker_GetQrDataJson(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& seed_hex) {
const base::android::JavaRef<jstring>& seed_hex) {
std::string str_seed_hex = base::android::ConvertJavaStringToUTF8(seed_hex);
DCHECK(!str_seed_hex.empty());
@@ -393,7 +393,7 @@ JNI_BraveSyncWorker_GetQrDataJson(
int JNI_BraveSyncWorker_GetQrCodeValidationResult(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& json_qr) {
const base::android::JavaRef<jstring>& json_qr) {
std::string str_json_qr = base::android::ConvertJavaStringToUTF8(json_qr);
DCHECK(!str_json_qr.empty());
return static_cast<int>(
@@ -402,7 +402,7 @@ int JNI_BraveSyncWorker_GetQrCodeValidationResult(
int JNI_BraveSyncWorker_GetWordsValidationResult(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& time_limited_words) {
const base::android::JavaRef<jstring>& time_limited_words) {
std::string str_time_limited_words =
base::android::ConvertJavaStringToUTF8(time_limited_words);
DCHECK(!str_time_limited_words.empty());
@@ -419,7 +419,7 @@ int JNI_BraveSyncWorker_GetWordsValidationResult(
static base::android::ScopedJavaLocalRef<jstring>
JNI_BraveSyncWorker_GetPureWordsFromTimeLimited(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& time_limited_words) {
const base::android::JavaRef<jstring>& time_limited_words) {
std::string str_time_limited_words =
base::android::ConvertJavaStringToUTF8(time_limited_words);
DCHECK(!str_time_limited_words.empty());
@@ -433,7 +433,7 @@ JNI_BraveSyncWorker_GetPureWordsFromTimeLimited(
static int64_t JNI_BraveSyncWorker_GetNotAfterFromFromTimeLimitedWords(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& time_limited_words) {
const base::android::JavaRef<jstring>& time_limited_words) {
std::string str_time_limited_words =
base::android::ConvertJavaStringToUTF8(time_limited_words);
DCHECK(!str_time_limited_words.empty());
@@ -493,7 +493,7 @@ JNI_BraveSyncWorker_GetFormattedTimeDelta(JNIEnv* env, jlong seconds) {
static base::android::ScopedJavaLocalRef<jstring>
JNI_BraveSyncWorker_GetTimeLimitedWordsFromPure(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& pure_words) {
const base::android::JavaRef<jstring>& pure_words) {
std::string str_pure_words =
base::android::ConvertJavaStringToUTF8(pure_words);
DCHECK(!str_pure_words.empty());
@@ -508,7 +508,7 @@ JNI_BraveSyncWorker_GetTimeLimitedWordsFromPure(
static base::android::ScopedJavaLocalRef<jstring>
JNI_BraveSyncWorker_GetSeedHexFromQrJson(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& json_qr) {
const base::android::JavaRef<jstring>& json_qr) {
std::string str_json_qr = base::android::ConvertJavaStringToUTF8(json_qr);
DCHECK(!str_json_qr.empty());
@@ -528,7 +528,7 @@ JNI_BraveSyncWorker_GetSeedHexFromQrJson(
static int JNI_BraveSyncWorker_GetWordsCount(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& words) {
const base::android::JavaRef<jstring>& words) {
return TimeLimitedWords::GetWordsCount(
base::android::ConvertJavaStringToUTF8(words));
}
browser/android/brave_sync_worker.h
+3 -3
View File
@@ -37,7 +37,7 @@ class BraveSyncWorker : public syncer::SyncServiceObserver {
base::android::ScopedJavaLocalRef<jstring> GetSyncCodeWords(JNIEnv* env);
void SaveCodeWords(JNIEnv* env,
const base::android::JavaParamRef<jstring>& passphrase);
const base::android::JavaRef<jstring>& passphrase);
void RequestSync(JNIEnv* env);
@@ -49,11 +49,11 @@ class BraveSyncWorker : public syncer::SyncServiceObserver {
void PermanentlyDeleteAccount(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& callback);
const base::android::JavaRef<jobject>& callback);
void SetJoinSyncChainCallback(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& callback);
const base::android::JavaRef<jobject>& callback);
void ClearAccountDeletedNoticePending(JNIEnv* env);
bool IsAccountDeletedNoticePending(JNIEnv* env);
browser/android/cosmetic_filters/cosmetic_filters_utils.cc
+1 -1
View File
@@ -13,7 +13,7 @@ namespace cosmetic_filters {
static jboolean JNI_BraveCosmeticFiltersUtils_LaunchContentPickerForWebContent(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& tab) {
const base::android::JavaRef<jobject>& tab) {
TabAndroid* tab_android = TabAndroid::GetNativeTab(env, tab);
content::WebContents* web_contents = tab_android->web_contents();
if (!web_contents) {
browser/android/preferences/brave_pref_service_bridge.cc
+8 -8
View File
@@ -29,7 +29,7 @@
#include "url/gurl.h"
using base::android::ConvertUTF8ToJavaString;
using base::android::JavaParamRef;
using base::android::JavaRef;
using base::android::ScopedJavaLocalRef;
using brave_shields::ControlType;
@@ -75,7 +75,7 @@ namespace android {
// This file is deprecated, prefs should be accessed directly from Java
void JNI_BravePrefServiceBridge_SetCookiesBlockType(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& type) {
const base::android::JavaRef<jstring>& type) {
brave_shields::SetCookieControlType(
HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile()),
GetOriginalProfile()->GetPrefs(),
@@ -118,21 +118,21 @@ jboolean JNI_BravePrefServiceBridge_GetDesktopModeEnabled(JNIEnv* env) {
jlong JNI_BravePrefServiceBridge_GetTrackersBlockedCount(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& j_profile) {
const base::android::JavaRef<jobject>& j_profile) {
Profile* profile = Profile::FromJavaObject(j_profile);
return profile->GetPrefs()->GetUint64(kTrackersBlocked);
}
jlong JNI_BravePrefServiceBridge_GetAdsBlockedCount(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& j_profile) {
const base::android::JavaRef<jobject>& j_profile) {
Profile* profile = Profile::FromJavaObject(j_profile);
return profile->GetPrefs()->GetUint64(kAdsBlocked);
}
jlong JNI_BravePrefServiceBridge_GetDataSaved(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& j_profile) {
const base::android::JavaRef<jobject>& j_profile) {
Profile* profile = Profile::FromJavaObject(j_profile);
return profile->GetPrefs()->GetUint64(
brave_perf_predictor::prefs::kBandwidthSavedBytes);
@@ -140,7 +140,7 @@ jlong JNI_BravePrefServiceBridge_GetDataSaved(
void JNI_BravePrefServiceBridge_SetOldTrackersBlockedCount(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& j_profile,
const base::android::JavaRef<jobject>& j_profile,
jlong count) {
if (count <= 0) {
return;
@@ -153,7 +153,7 @@ void JNI_BravePrefServiceBridge_SetOldTrackersBlockedCount(
void JNI_BravePrefServiceBridge_SetOldAdsBlockedCount(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& j_profile,
const base::android::JavaRef<jobject>& j_profile,
jlong count) {
if (count <= 0) {
return;
@@ -165,7 +165,7 @@ void JNI_BravePrefServiceBridge_SetOldAdsBlockedCount(
void JNI_BravePrefServiceBridge_SetOldHttpsUpgradesCount(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& j_profile,
const base::android::JavaRef<jobject>& j_profile,
jlong count) {
if (count <= 0) {
return;
browser/android/youtube_script_injector/brave_youtube_script_injector_native_helper.cc
+3 -3
View File
@@ -16,7 +16,7 @@ namespace youtube_script_injector {
// static
void JNI_BraveYouTubeScriptInjectorNativeHelper_SetFullscreen(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& jweb_contents) {
const base::android::JavaRef<jobject>& jweb_contents) {
content::WebContents* web_contents =
content::WebContents::FromJavaWebContents(jweb_contents);
YouTubeScriptInjectorTabHelper* helper =
@@ -31,7 +31,7 @@ void JNI_BraveYouTubeScriptInjectorNativeHelper_SetFullscreen(
// static
jboolean JNI_BraveYouTubeScriptInjectorNativeHelper_HasFullscreenBeenRequested(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& jweb_contents) {
const base::android::JavaRef<jobject>& jweb_contents) {
content::WebContents* web_contents =
content::WebContents::FromJavaWebContents(jweb_contents);
@@ -47,7 +47,7 @@ jboolean JNI_BraveYouTubeScriptInjectorNativeHelper_HasFullscreenBeenRequested(
// static
jboolean JNI_BraveYouTubeScriptInjectorNativeHelper_IsPictureInPictureAvailable(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& jweb_contents) {
const base::android::JavaRef<jobject>& jweb_contents) {
content::WebContents* web_contents =
content::WebContents::FromJavaWebContents(jweb_contents);
browser/brave_account/android/brave_account_service_factory_android.cc
+1 -1
View File
@@ -18,7 +18,7 @@ namespace chrome::android {
static jlong JNI_BraveAccountServiceFactory_GetInterfaceToBraveAccountService(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& profile_android) {
const base::android::JavaRef<jobject>& profile_android) {
auto* profile = Profile::FromJavaObject(profile_android);
auto* brave_account_service =
brave_account::BraveAccountServiceFactory::GetFor(profile);
browser/brave_ads/android/brave_ads_native_helper.cc
+10 -10
View File
@@ -22,7 +22,7 @@ namespace brave_ads {
// static
jboolean JNI_BraveAdsNativeHelper_IsOptedInToNotificationAds(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& j_profile_android) {
const base::android::JavaRef<jobject>& j_profile_android) {
Profile* profile = Profile::FromJavaObject(j_profile_android);
return profile->GetPrefs()->GetBoolean(
brave_ads::prefs::kOptedInToNotificationAds);
@@ -31,7 +31,7 @@ jboolean JNI_BraveAdsNativeHelper_IsOptedInToNotificationAds(
// static
void JNI_BraveAdsNativeHelper_SetOptedInToNotificationAds(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& j_profile_android,
const base::android::JavaRef<jobject>& j_profile_android,
jboolean should_enable_ads) {
Profile* profile = Profile::FromJavaObject(j_profile_android);
profile->GetPrefs()->SetBoolean(brave_ads::prefs::kOptedInToNotificationAds,
@@ -41,7 +41,7 @@ void JNI_BraveAdsNativeHelper_SetOptedInToNotificationAds(
// static
jboolean JNI_BraveAdsNativeHelper_IsSupportedRegion(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& j_profile_android) {
const base::android::JavaRef<jobject>& j_profile_android) {
Profile* profile = Profile::FromJavaObject(j_profile_android);
AdsService* ads_service = AdsServiceFactory::GetForProfile(profile);
if (!ads_service) {
@@ -54,7 +54,7 @@ jboolean JNI_BraveAdsNativeHelper_IsSupportedRegion(
// static
void JNI_BraveAdsNativeHelper_ClearData(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& j_profile_android) {
const base::android::JavaRef<jobject>& j_profile_android) {
Profile* profile = Profile::FromJavaObject(j_profile_android);
AdsService* ads_service = AdsServiceFactory::GetForProfile(profile);
if (!ads_service) {
@@ -67,8 +67,8 @@ void JNI_BraveAdsNativeHelper_ClearData(
// static
void JNI_BraveAdsNativeHelper_OnNotificationAdShown(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& j_profile_android,
const base::android::JavaParamRef<jstring>& j_notification_id) {
const base::android::JavaRef<jobject>& j_profile_android,
const base::android::JavaRef<jstring>& j_notification_id) {
Profile* profile = Profile::FromJavaObject(j_profile_android);
AdsService* ads_service = AdsServiceFactory::GetForProfile(profile);
if (!ads_service) {
@@ -83,8 +83,8 @@ void JNI_BraveAdsNativeHelper_OnNotificationAdShown(
// static
void JNI_BraveAdsNativeHelper_OnNotificationAdClosed(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& j_profile_android,
const base::android::JavaParamRef<jstring>& j_notification_id,
const base::android::JavaRef<jobject>& j_profile_android,
const base::android::JavaRef<jstring>& j_notification_id,
jboolean j_by_user) {
Profile* profile = Profile::FromJavaObject(j_profile_android);
AdsService* ads_service = AdsServiceFactory::GetForProfile(profile);
@@ -100,8 +100,8 @@ void JNI_BraveAdsNativeHelper_OnNotificationAdClosed(
// static
void JNI_BraveAdsNativeHelper_OnNotificationAdClicked(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& j_profile_android,
const base::android::JavaParamRef<jstring>& j_notification_id) {
const base::android::JavaRef<jobject>& j_profile_android,
const base::android::JavaRef<jstring>& j_notification_id) {
Profile* profile = Profile::FromJavaObject(j_profile_android);
AdsService* ads_service = AdsServiceFactory::GetForProfile(profile);
if (!ads_service) {
browser/brave_ads/android/brave_ads_native_helper.h
+10 -10
View File
@@ -12,36 +12,36 @@ namespace brave_ads {
static jboolean JNI_BraveAdsNativeHelper_IsOptedInToNotificationAds(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& j_profile_android);
const base::android::JavaRef<jobject>& j_profile_android);
static void JNI_BraveAdsNativeHelper_SetOptedInToNotificationAds(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& j_profile_android,
const base::android::JavaRef<jobject>& j_profile_android,
jboolean opted_in);
static jboolean JNI_BraveAdsNativeHelper_IsSupportedRegion(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& j_profile_android);
const base::android::JavaRef<jobject>& j_profile_android);
static void JNI_BraveAdsNativeHelper_ClearData(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& j_profile_android);
const base::android::JavaRef<jobject>& j_profile_android);
static void JNI_BraveAdsNativeHelper_OnNotificationAdShown(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& j_profile_android,
const base::android::JavaParamRef<jstring>& j_notification_id);
const base::android::JavaRef<jobject>& j_profile_android,
const base::android::JavaRef<jstring>& j_notification_id);
static void JNI_BraveAdsNativeHelper_OnNotificationAdClosed(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& j_profile_android,
const base::android::JavaParamRef<jstring>& j_notification_id,
const base::android::JavaRef<jobject>& j_profile_android,
const base::android::JavaRef<jstring>& j_notification_id,
jboolean j_by_user);
static void JNI_BraveAdsNativeHelper_OnNotificationAdClicked(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& j_profile_android,
const base::android::JavaParamRef<jstring>& j_notification_id);
const base::android::JavaRef<jobject>& j_profile_android,
const base::android::JavaRef<jstring>& j_notification_id);
} // namespace brave_ads
browser/brave_news/android/brave_news_controller_factory_android.cc
+1 -1
View File
@@ -14,7 +14,7 @@ namespace chrome {
namespace android {
static jlong JNI_BraveNewsControllerFactory_GetInterfaceToBraveNewsController(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& profile_android) {
const base::android::JavaRef<jobject>& profile_android) {
auto* profile = Profile::FromJavaObject(profile_android);
auto pending = brave_news::BraveNewsControllerFactory::GetInstance()
->GetRemoteForProfile(profile);
browser/brave_rewards/android/brave_rewards_native_worker.cc
+17 -15
View File
@@ -137,7 +137,7 @@ bool BraveRewardsNativeWorker::ShouldShowSelfCustodyInvite(JNIEnv* env) {
void BraveRewardsNativeWorker::CreateRewardsWallet(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& country_code) {
const base::android::JavaRef<jstring>& country_code) {
if (brave_rewards_service_) {
brave_rewards_service_->CreateRewardsWallet(
base::android::ConvertJavaStringToUTF8(env, country_code),
@@ -241,7 +241,7 @@ void BraveRewardsNativeWorker::OnBalance(
void BraveRewardsNativeWorker::GetPublisherInfo(
JNIEnv* env,
int tabId,
const base::android::JavaParamRef<jstring>& host) {
const base::android::JavaRef<jstring>& host) {
if (brave_rewards_service_) {
brave_rewards_service_->NotifyPublisherPageVisit(
tabId, base::android::ConvertJavaStringToUTF8(env, host), "", "");
@@ -308,8 +308,8 @@ BraveRewardsNativeWorker::GetPublisherFavIconURL(JNIEnv* env, uint64_t tabId) {
base::android::ScopedJavaLocalRef<jstring>
BraveRewardsNativeWorker::GetCaptchaSolutionURL(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& paymentId,
const base::android::JavaParamRef<jstring>& captchaId) {
const base::android::JavaRef<jstring>& paymentId,
const base::android::JavaRef<jstring>& captchaId) {
const std::string path =
absl::StrFormat("/v3/captcha/solution/%s/%s",
base::android::ConvertJavaStringToUTF8(env, paymentId),
@@ -332,7 +332,7 @@ BraveRewardsNativeWorker::GetAttestationURL(JNIEnv* env) {
base::android::ScopedJavaLocalRef<jstring>
BraveRewardsNativeWorker::GetAttestationURLWithPaymentId(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& paymentId) {
const base::android::JavaRef<jstring>& paymentId) {
const std::string path =
base::StrCat({"/v1/attestations/android/",
base::android::ConvertJavaStringToUTF8(env, paymentId)});
@@ -536,7 +536,7 @@ void BraveRewardsNativeWorker::OnGetCurrentBalanceReport(
void BraveRewardsNativeWorker::Donate(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& publisher_key,
const base::android::JavaRef<jstring>& publisher_key,
double amount,
bool recurring) {
if (brave_rewards_service_) {
@@ -560,8 +560,9 @@ void BraveRewardsNativeWorker::GetAllNotifications(JNIEnv* env) {
}
}
void BraveRewardsNativeWorker::DeleteNotification(JNIEnv* env,
const base::android::JavaParamRef<jstring>& notification_id) {
void BraveRewardsNativeWorker::DeleteNotification(
JNIEnv* env,
const base::android::JavaRef<jstring>& notification_id) {
if (rewards_notification_service_observation_.IsObserving()) {
rewards_notification_service_observation_.GetSource()->DeleteNotification(
base::android::ConvertJavaStringToUTF8(env, notification_id));
@@ -590,7 +591,7 @@ void BraveRewardsNativeWorker::OnGetRecurringTips(
bool BraveRewardsNativeWorker::IsCurrentPublisherInRecurrentDonations(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& publisher) {
const base::android::JavaRef<jstring>& publisher) {
return map_recurrent_publishers_.find(
base::android::ConvertJavaStringToUTF8(env, publisher)) !=
map_recurrent_publishers_.end();
@@ -630,7 +631,7 @@ void BraveRewardsNativeWorker::OnResetTheWholeState(const bool success) {
double BraveRewardsNativeWorker::GetPublisherRecurrentDonationAmount(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& publisher) {
const base::android::JavaRef<jstring>& publisher) {
double amount(0.0);
auto it = map_recurrent_publishers_.find(
base::android::ConvertJavaStringToUTF8(env, publisher));
@@ -641,8 +642,9 @@ double BraveRewardsNativeWorker::GetPublisherRecurrentDonationAmount(
return amount;
}
void BraveRewardsNativeWorker::RemoveRecurring(JNIEnv* env,
const base::android::JavaParamRef<jstring>& publisher) {
void BraveRewardsNativeWorker::RemoveRecurring(
JNIEnv* env,
const base::android::JavaRef<jstring>& publisher) {
if (brave_rewards_service_) {
brave_rewards_service_->RemoveRecurringTip(
base::android::ConvertJavaStringToUTF8(env, publisher));
@@ -796,7 +798,7 @@ void BraveRewardsNativeWorker::OnGetPublishersVisitedCount(int count) {
void BraveRewardsNativeWorker::GetPublisherBanner(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& publisher_key) {
const base::android::JavaRef<jstring>& publisher_key) {
if (brave_rewards_service_) {
brave_rewards_service_->GetPublisherBanner(
base::android::ConvertJavaStringToUTF8(env, publisher_key),
@@ -895,7 +897,7 @@ void BraveRewardsNativeWorker::OnExternalWalletReconnected() {
void BraveRewardsNativeWorker::RefreshPublisher(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& publisher_key) {
const base::android::JavaRef<jstring>& publisher_key) {
if (!brave_rewards_service_) {
return;
}
@@ -924,7 +926,7 @@ void BraveRewardsNativeWorker::RecordPanelTrigger(JNIEnv* env) {
static void JNI_BraveRewardsNativeWorker_Init(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& jcaller) {
const base::android::JavaRef<jobject>& jcaller) {
new BraveRewardsNativeWorker(env, jcaller);
}
browser/brave_rewards/android/brave_rewards_native_worker.h
+15 -18
View File
@@ -53,9 +53,8 @@ class BraveRewardsNativeWorker
bool ShouldShowSelfCustodyInvite(JNIEnv* env);
void CreateRewardsWallet(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& country_code);
void CreateRewardsWallet(JNIEnv* env,
const base::android::JavaRef<jstring>& country_code);
void GetRewardsParameters(JNIEnv* env);
@@ -69,7 +68,7 @@ class BraveRewardsNativeWorker
void GetPublisherInfo(JNIEnv* env,
int tabId,
const base::android::JavaParamRef<jstring>& host);
const base::android::JavaRef<jstring>& host);
base::android::ScopedJavaLocalRef<jstring> GetWalletBalance(JNIEnv* env);
@@ -94,12 +93,12 @@ class BraveRewardsNativeWorker
uint64_t tabId);
base::android::ScopedJavaLocalRef<jstring> GetCaptchaSolutionURL(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& paymentId,
const base::android::JavaParamRef<jstring>& captchaId);
const base::android::JavaRef<jstring>& paymentId,
const base::android::JavaRef<jstring>& captchaId);
base::android::ScopedJavaLocalRef<jstring> GetAttestationURL(JNIEnv* env);
base::android::ScopedJavaLocalRef<jstring> GetAttestationURLWithPaymentId(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& paymentId);
const base::android::JavaRef<jstring>& paymentId);
base::android::ScopedJavaLocalRef<jstring> GetPublisherId(JNIEnv* env,
uint64_t tabId);
@@ -115,7 +114,7 @@ class BraveRewardsNativeWorker
void RemovePublisherFromMap(JNIEnv* env, uint64_t tabId);
void Donate(JNIEnv* env,
const base::android::JavaParamRef<jstring>& publisher_key,
const base::android::JavaRef<jstring>& publisher_key,
double amount,
bool recurring);
@@ -123,13 +122,13 @@ class BraveRewardsNativeWorker
void DeleteNotification(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& notification_id);
const base::android::JavaRef<jstring>& notification_id);
void GetRecurringDonations(JNIEnv* env);
bool IsCurrentPublisherInRecurrentDonations(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& publisher);
const base::android::JavaRef<jstring>& publisher);
void GetReconcileStamp(JNIEnv* env);
@@ -137,10 +136,10 @@ class BraveRewardsNativeWorker
double GetPublisherRecurrentDonationAmount(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& publisher);
const base::android::JavaRef<jstring>& publisher);
void RemoveRecurring(JNIEnv* env,
const base::android::JavaParamRef<jstring>& publisher);
const base::android::JavaRef<jstring>& publisher);
int GetAdsPerHour(JNIEnv* env);
@@ -156,9 +155,8 @@ class BraveRewardsNativeWorker
void GetAvailableCountries(JNIEnv* env);
void GetPublisherBanner(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& publisher_key);
void GetPublisherBanner(JNIEnv* env,
const base::android::JavaRef<jstring>& publisher_key);
void GetPublishersVisitedCount(JNIEnv* env);
@@ -166,9 +164,8 @@ class BraveRewardsNativeWorker
void DisconnectWallet(JNIEnv* env);
void RefreshPublisher(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& publisher_key);
void RefreshPublisher(JNIEnv* env,
const base::android::JavaRef<jstring>& publisher_key);
void RecordPanelTrigger(JNIEnv* env);
browser/brave_shields/android/brave_first_party_storage_cleaner_utils.cc
+1 -1
View File
@@ -45,7 +45,7 @@ static void JNI_BraveFirstPartyStorageCleanerUtils_CleanupTLDFirstPartyStorage(
static void
JNI_BraveFirstPartyStorageCleanerUtils_TriggerCurrentAppStateNotification(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& j_profile) {
const base::android::JavaRef<jobject>& j_profile) {
CHECK(env);
Profile* profile = Profile::FromJavaObject(j_profile);
if (!profile) {
browser/brave_shields/android/filter_list_service_factory_android.cc
+1 -1
View File
@@ -14,7 +14,7 @@ namespace chrome {
namespace android {
static jlong JNI_FilterListServiceFactory_GetInterfaceToFilterListService(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& profile_android) {
const base::android::JavaRef<jobject>& profile_android) {
auto* profile = Profile::FromJavaObject(profile_android);
auto pending = brave_shields::FilterListServiceFactory::GetInstance()
->GetRemoteForProfile(profile);
browser/brave_vpn/android/brave_vpn_native_worker.cc
+24 -24
View File
@@ -43,7 +43,7 @@ BraveVpnNativeWorker::~BraveVpnNativeWorker() {}
void BraveVpnNativeWorker::Destroy(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& jcaller) {
const base::android::JavaRef<jobject>& jcaller) {
delete this;
}
@@ -67,8 +67,8 @@ void BraveVpnNativeWorker::OnGetTimezonesForRegions(
void BraveVpnNativeWorker::GetHostnamesForRegion(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& region,
const base::android::JavaParamRef<jstring>& region_precision) {
const base::android::JavaRef<jstring>& region,
const base::android::JavaRef<jstring>& region_precision) {
BraveVpnService* brave_vpn_service = GetBraveVpnService();
if (brave_vpn_service) {
brave_vpn_service->GetHostnamesForRegion(
@@ -90,9 +90,9 @@ void BraveVpnNativeWorker::OnGetHostnamesForRegion(
void BraveVpnNativeWorker::GetWireguardProfileCredentials(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& subscriber_credential,
const base::android::JavaParamRef<jstring>& public_key,
const base::android::JavaParamRef<jstring>& hostname) {
const base::android::JavaRef<jstring>& subscriber_credential,
const base::android::JavaRef<jstring>& public_key,
const base::android::JavaRef<jstring>& hostname) {
BraveVpnService* brave_vpn_service = GetBraveVpnService();
if (brave_vpn_service) {
brave_vpn_service->GetWireguardProfileCredentials(
@@ -117,10 +117,10 @@ void BraveVpnNativeWorker::OnGetWireguardProfileCredentials(
void BraveVpnNativeWorker::VerifyCredentials(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& hostname,
const base::android::JavaParamRef<jstring>& client_id,
const base::android::JavaParamRef<jstring>& subscriber_credential,
const base::android::JavaParamRef<jstring>& api_auth_token) {
const base::android::JavaRef<jstring>& hostname,
const base::android::JavaRef<jstring>& client_id,
const base::android::JavaRef<jstring>& subscriber_credential,
const base::android::JavaRef<jstring>& api_auth_token) {
BraveVpnService* brave_vpn_service = GetBraveVpnService();
if (brave_vpn_service) {
brave_vpn_service->VerifyCredentials(
@@ -145,10 +145,10 @@ void BraveVpnNativeWorker::OnVerifyCredentials(
void BraveVpnNativeWorker::InvalidateCredentials(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& hostname,
const base::android::JavaParamRef<jstring>& client_id,
const base::android::JavaParamRef<jstring>& subscriber_credential,
const base::android::JavaParamRef<jstring>& api_auth_token) {
const base::android::JavaRef<jstring>& hostname,
const base::android::JavaRef<jstring>& client_id,
const base::android::JavaRef<jstring>& subscriber_credential,
const base::android::JavaRef<jstring>& api_auth_token) {
BraveVpnService* brave_vpn_service = GetBraveVpnService();
if (brave_vpn_service) {
brave_vpn_service->InvalidateCredentials(
@@ -173,11 +173,11 @@ void BraveVpnNativeWorker::OnInvalidateCredentials(
void BraveVpnNativeWorker::GetSubscriberCredential(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& product_type,
const base::android::JavaParamRef<jstring>& product_id,
const base::android::JavaParamRef<jstring>& validation_method,
const base::android::JavaParamRef<jstring>& purchase_token,
const base::android::JavaParamRef<jstring>& bundle_id) {
const base::android::JavaRef<jstring>& product_type,
const base::android::JavaRef<jstring>& product_id,
const base::android::JavaRef<jstring>& validation_method,
const base::android::JavaRef<jstring>& purchase_token,
const base::android::JavaRef<jstring>& bundle_id) {
BraveVpnService* brave_vpn_service = GetBraveVpnService();
if (brave_vpn_service) {
brave_vpn_service->GetSubscriberCredential(
@@ -212,10 +212,10 @@ void BraveVpnNativeWorker::OnGetSubscriberCredential(
void BraveVpnNativeWorker::VerifyPurchaseToken(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& purchase_token,
const base::android::JavaParamRef<jstring>& product_id,
const base::android::JavaParamRef<jstring>& product_type,
const base::android::JavaParamRef<jstring>& bundle_id) {
const base::android::JavaRef<jstring>& purchase_token,
const base::android::JavaRef<jstring>& product_id,
const base::android::JavaRef<jstring>& product_type,
const base::android::JavaRef<jstring>& bundle_id) {
BraveVpnService* brave_vpn_service = GetBraveVpnService();
if (brave_vpn_service) {
brave_vpn_service->VerifyPurchaseToken(
@@ -280,7 +280,7 @@ void BraveVpnNativeWorker::ReportBackgroundP3A(JNIEnv* env,
static void JNI_BraveVpnNativeWorker_Init(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& jcaller) {
const base::android::JavaRef<jobject>& jcaller) {
new BraveVpnNativeWorker(env, jcaller);
}
browser/brave_vpn/android/brave_vpn_native_worker.h
+23 -24
View File
@@ -22,8 +22,7 @@ class BraveVpnNativeWorker {
BraveVpnNativeWorker(const BraveVpnNativeWorker&) = delete;
BraveVpnNativeWorker& operator=(const BraveVpnNativeWorker&) = delete;
void Destroy(JNIEnv* env,
const base::android::JavaParamRef<jobject>& jcaller);
void Destroy(JNIEnv* env, const base::android::JavaRef<jobject>& jcaller);
void GetTimezonesForRegions(JNIEnv* env);
@@ -32,16 +31,16 @@ class BraveVpnNativeWorker {
void GetHostnamesForRegion(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& region,
const base::android::JavaParamRef<jstring>& region_precision);
const base::android::JavaRef<jstring>& region,
const base::android::JavaRef<jstring>& region_precision);
void OnGetHostnamesForRegion(const std::string& hostname_json, bool success);
void GetWireguardProfileCredentials(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& subscriber_credential,
const base::android::JavaParamRef<jstring>& public_key,
const base::android::JavaParamRef<jstring>& hostname);
const base::android::JavaRef<jstring>& subscriber_credential,
const base::android::JavaRef<jstring>& public_key,
const base::android::JavaRef<jstring>& hostname);
void OnGetWireguardProfileCredentials(
const std::string& wireguard_profile_credentials_json,
@@ -49,30 +48,30 @@ class BraveVpnNativeWorker {
void VerifyCredentials(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& hostname,
const base::android::JavaParamRef<jstring>& client_id,
const base::android::JavaParamRef<jstring>& subscriber_credential,
const base::android::JavaParamRef<jstring>& api_auth_token);
const base::android::JavaRef<jstring>& hostname,
const base::android::JavaRef<jstring>& client_id,
const base::android::JavaRef<jstring>& subscriber_credential,
const base::android::JavaRef<jstring>& api_auth_token);
void OnVerifyCredentials(const std::string& verify_credentials_json,
bool success);
void InvalidateCredentials(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& hostname,
const base::android::JavaParamRef<jstring>& client_id,
const base::android::JavaParamRef<jstring>& subscriber_credential,
const base::android::JavaParamRef<jstring>& api_auth_token);
const base::android::JavaRef<jstring>& hostname,
const base::android::JavaRef<jstring>& client_id,
const base::android::JavaRef<jstring>& subscriber_credential,
const base::android::JavaRef<jstring>& api_auth_token);
void OnInvalidateCredentials(const std::string& invalidate_credentials_json,
bool success);
void GetSubscriberCredential(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& product_type,
const base::android::JavaParamRef<jstring>& product_id,
const base::android::JavaParamRef<jstring>& validation_method,
const base::android::JavaParamRef<jstring>& purchase_token,
const base::android::JavaParamRef<jstring>& bundle_id);
const base::android::JavaRef<jstring>& product_type,
const base::android::JavaRef<jstring>& product_id,
const base::android::JavaRef<jstring>& validation_method,
const base::android::JavaRef<jstring>& purchase_token,
const base::android::JavaRef<jstring>& bundle_id);
void GetSubscriberCredentialV12(JNIEnv* env);
@@ -81,10 +80,10 @@ class BraveVpnNativeWorker {
void VerifyPurchaseToken(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& purchase_token,
const base::android::JavaParamRef<jstring>& product_id,
const base::android::JavaParamRef<jstring>& product_type,
const base::android::JavaParamRef<jstring>& bundle_id);
const base::android::JavaRef<jstring>& purchase_token,
const base::android::JavaRef<jstring>& product_id,
const base::android::JavaRef<jstring>& product_type,
const base::android::JavaRef<jstring>& bundle_id);
void OnVerifyPurchaseToken(const std::string& purchase_token,
const std::string& product_id,
browser/brave_vpn/android/brave_vpn_service_factory_android.cc
+1 -1
View File
@@ -14,7 +14,7 @@ namespace chrome {
namespace android {
static jlong JNI_BraveVpnServiceFactoryAndroid_GetInterfaceToVpnService(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& profile_android) {
const base::android::JavaRef<jobject>& profile_android) {
auto* profile = Profile::FromJavaObject(profile_android);
if (profile == nullptr) {
return static_cast<jlong>(-1);
browser/brave_wallet/android/asset_ratio_service_factory_android.cc
+1 -1
View File
@@ -14,7 +14,7 @@ namespace chrome {
namespace android {
static jlong JNI_AssetRatioServiceFactory_GetInterfaceToAssetRatioService(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& profile_android) {
const base::android::JavaRef<jobject>& profile_android) {
auto* profile = Profile::FromJavaObject(profile_android);
auto pending =
brave_wallet::AssetRatioServiceFactory::GetInstance()->GetForContext(
browser/brave_wallet/android/blockchain_registry_factory_android.cc
+1 -1
View File
@@ -27,7 +27,7 @@ static jlong JNI_BlockchainRegistryFactory_GetInterfaceToBlockchainRegistry(
static base::android::ScopedJavaLocalRef<jstring>
JNI_BlockchainRegistryFactory_GetTokensIconsLocation(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& profile_android) {
const base::android::JavaRef<jobject>& profile_android) {
auto* profile = Profile::FromJavaObject(profile_android);
std::optional<base::Version> version =
browser/brave_wallet/android/brave_wallet_service_factory_android.cc
+8 -8
View File
@@ -19,7 +19,7 @@ namespace {
template <class T>
jlong BindWalletService(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& profile_android) {
const base::android::JavaRef<jobject>& profile_android) {
auto* profile = Profile::FromJavaObject(profile_android);
if (auto* brave_wallet_service =
brave_wallet::BraveWalletServiceFactory::GetServiceForContext(
@@ -34,49 +34,49 @@ jlong BindWalletService(
static jlong JNI_BraveWalletServiceFactory_GetInterfaceToBraveWalletService(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& profile_android) {
const base::android::JavaRef<jobject>& profile_android) {
return BindWalletService<brave_wallet::mojom::BraveWalletService>(
env, profile_android);
}
static jlong JNI_BraveWalletServiceFactory_GetInterfaceToBraveWalletP3A(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& profile_android) {
const base::android::JavaRef<jobject>& profile_android) {
return BindWalletService<brave_wallet::mojom::BraveWalletP3A>(
env, profile_android);
}
static jlong JNI_BraveWalletServiceFactory_GetInterfaceToJsonRpcService(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& profile_android) {
const base::android::JavaRef<jobject>& profile_android) {
return BindWalletService<brave_wallet::mojom::JsonRpcService>(
env, profile_android);
}
static jlong JNI_BraveWalletServiceFactory_GetInterfaceToKeyringService(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& profile_android) {
const base::android::JavaRef<jobject>& profile_android) {
return BindWalletService<brave_wallet::mojom::KeyringService>(
env, profile_android);
}
static jlong JNI_BraveWalletServiceFactory_GetInterfaceToTxService(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& profile_android) {
const base::android::JavaRef<jobject>& profile_android) {
return BindWalletService<brave_wallet::mojom::TxService>(env,
profile_android);
}
static jlong JNI_BraveWalletServiceFactory_GetInterfaceToEthTxManagerProxy(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& profile_android) {
const base::android::JavaRef<jobject>& profile_android) {
return BindWalletService<brave_wallet::mojom::EthTxManagerProxy>(
env, profile_android);
}
static jlong JNI_BraveWalletServiceFactory_GetInterfaceToSolanaTxManagerProxy(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& profile_android) {
const base::android::JavaRef<jobject>& profile_android) {
return BindWalletService<brave_wallet::mojom::SolanaTxManagerProxy>(
env, profile_android);
}
browser/brave_wallet/android/swap_service_factory_android.cc
+1 -1
View File
@@ -14,7 +14,7 @@ namespace chrome {
namespace android {
static jlong JNI_SwapServiceFactory_GetInterfaceToSwapService(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& profile_android) {
const base::android::JavaRef<jobject>& profile_android) {
auto* profile = Profile::FromJavaObject(profile_android);
auto pending =
brave_wallet::SwapServiceFactory::GetInstance()->GetForContext(profile);
browser/brave_wallet/android/wallet_native_utils_android.cc
+4 -4
View File
@@ -17,7 +17,7 @@ namespace android {
static void JNI_WalletNativeUtils_ResetWallet(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& profile_android) {
const base::android::JavaRef<jobject>& profile_android) {
auto* profile = Profile::FromJavaObject(profile_android);
DCHECK(profile);
@@ -30,7 +30,7 @@ static void JNI_WalletNativeUtils_ResetWallet(
static jboolean JNI_WalletNativeUtils_IsUnstoppableDomainsTld(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& domain) {
const base::android::JavaRef<jstring>& domain) {
auto domain_string = base::android::ConvertJavaStringToUTF8(env, domain);
return decentralized_dns::IsUnstoppableDomainsTLD(domain_string);
@@ -38,7 +38,7 @@ static jboolean JNI_WalletNativeUtils_IsUnstoppableDomainsTld(
static jboolean JNI_WalletNativeUtils_IsEnsTld(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& domain) {
const base::android::JavaRef<jstring>& domain) {
auto domain_string = base::android::ConvertJavaStringToUTF8(env, domain);
return decentralized_dns::IsENSTLD(domain_string);
@@ -46,7 +46,7 @@ static jboolean JNI_WalletNativeUtils_IsEnsTld(
static jboolean JNI_WalletNativeUtils_IsSnsTld(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& domain) {
const base::android::JavaRef<jstring>& domain) {
auto domain_string = base::android::ConvertJavaStringToUTF8(env, domain);
return decentralized_dns::IsSnsTLD(domain_string);
browser/brave_wallet/brave_wallet_provider_delegate_impl_helper_android.cc
+4 -4
View File
@@ -14,7 +14,7 @@
#include "content/public/browser/render_frame_host.h"
#include "content/public/browser/web_contents.h"
using base::android::JavaParamRef;
using base::android::JavaRef;
namespace brave_wallet {
@@ -62,9 +62,9 @@ bool IsWeb3NotificationAllowed() {
static void JNI_BraveWalletProviderDelegateImplHelper_IsSolanaConnected(
JNIEnv* env,
const JavaParamRef<jobject>& jweb_contents,
const base::android::JavaParamRef<jstring>& jaccount,
const JavaParamRef<jobject>& jcallback) {
const JavaRef<jobject>& jweb_contents,
const base::android::JavaRef<jstring>& jaccount,
const JavaRef<jobject>& jcallback) {
content::RenderFrameHost* rfh = nullptr;
content::WebContents* web_contents =
content::WebContents::FromJavaWebContents(jweb_contents);
browser/misc_metrics/misc_android_metrics_factory_android.cc
+1 -1
View File
@@ -15,7 +15,7 @@ namespace chrome {
namespace android {
static jlong JNI_MiscAndroidMetricsFactory_GetInterfaceToMiscAndroidMetrics(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& profile_android) {
const base::android::JavaRef<jobject>& profile_android) {
auto* profile = Profile::FromJavaObject(profile_android);
auto* service = misc_metrics::ProfileMiscMetricsServiceFactory::GetInstance()
->GetServiceForContext(profile);
browser/ntp_background/android/ntp_background_images_bridge.cc
+7 -9
View File
@@ -35,7 +35,6 @@
using base::android::AttachCurrentThread;
using base::android::ConvertUTF8ToJavaString;
using base::android::JavaParamRef;
using base::android::JavaRef;
using base::android::ScopedJavaLocalRef;
using content::BrowserThread;
@@ -98,9 +97,8 @@ NTPBackgroundImagesBridge::~NTPBackgroundImagesBridge() {
}
static base::android::ScopedJavaLocalRef<jobject>
JNI_NTPBackgroundImagesBridge_GetInstance(
JNIEnv* env,
const JavaParamRef<jobject>& j_profile) {
JNI_NTPBackgroundImagesBridge_GetInstance(JNIEnv* env,
const JavaRef<jobject>& j_profile) {
auto* profile = Profile::FromJavaObject(j_profile);
return ntp_background_images::NTPBackgroundImagesBridgeFactory::GetInstance()
->GetForProfile(profile)
@@ -114,10 +112,10 @@ NTPBackgroundImagesBridge::GetJavaObject() {
void NTPBackgroundImagesBridge::WallpaperLogoClicked(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj,
const base::android::JavaParamRef<jstring>& jwallpaperId,
const base::android::JavaParamRef<jstring>& jcreativeInstanceId,
const base::android::JavaParamRef<jstring>& jdestinationUrl,
const base::android::JavaRef<jobject>& obj,
const base::android::JavaRef<jstring>& jwallpaperId,
const base::android::JavaRef<jstring>& jcreativeInstanceId,
const base::android::JavaRef<jstring>& jdestinationUrl,
int metricType) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
if (view_counter_service_) {
@@ -207,7 +205,7 @@ NTPBackgroundImagesBridge::CreateBrandedWallpaper(
base::android::ScopedJavaLocalRef<jobject>
NTPBackgroundImagesBridge::GetCurrentWallpaper(JNIEnv* env,
const JavaParamRef<jobject>& obj,
const JavaRef<jobject>& obj,
jboolean allow_sponsored_image) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
if (!view_counter_service_) {
browser/ntp_background/android/ntp_background_images_bridge.h
+5 -5
View File
@@ -40,14 +40,14 @@ class NTPBackgroundImagesBridge
void WallpaperLogoClicked(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj,
const base::android::JavaParamRef<jstring>& jwallpaperId,
const base::android::JavaParamRef<jstring>& jcreativeInstanceId,
const base::android::JavaParamRef<jstring>& jdestinationUrl,
const base::android::JavaRef<jobject>& obj,
const base::android::JavaRef<jstring>& jwallpaperId,
const base::android::JavaRef<jstring>& jcreativeInstanceId,
const base::android::JavaRef<jstring>& jdestinationUrl,
int metricType);
base::android::ScopedJavaLocalRef<jobject> GetCurrentWallpaper(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj,
const base::android::JavaRef<jobject>& obj,
jboolean allow_sponsored_image);
base::android::ScopedJavaLocalRef<jobject> GetJavaObject();
browser/password_manager/android/password_ui_view_android.cc
+5 -7
View File
@@ -53,7 +53,6 @@
namespace {
using base::android::JavaParamRef;
using base::android::JavaRef;
using base::android::ScopedJavaLocalRef;
using IsInsecureCredential = CredentialEditBridge::IsInsecureCredential;
@@ -256,7 +255,7 @@ void PasswordUiViewAndroid::HandleSerializePasswords(
void PasswordUiViewAndroid::HandleShowPasswordEntryEditingView(
JNIEnv* env,
const JavaParamRef<jobject>& context,
const JavaRef<jobject>& context,
int index) {
if (static_cast<size_t>(index) >= passwords_.size() ||
credential_edit_bridge_) {
@@ -277,7 +276,7 @@ void PasswordUiViewAndroid::HandleShowPasswordEntryEditingView(
void PasswordUiViewAndroid::HandleShowBlockedCredentialView(
JNIEnv* env,
const JavaParamRef<jobject>& context,
const JavaRef<jobject>& context,
int index) {
if (static_cast<size_t>(index) >= blocked_sites_.size() ||
credential_edit_bridge_) {
@@ -351,10 +350,9 @@ jint JNI_PasswordUiView_GetMaxPasswordsPerCsvFile(JNIEnv* env) {
}
// static
static jlong JNI_PasswordUiView_Init(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj,
Profile* profile) {
static jlong JNI_PasswordUiView_Init(JNIEnv* env,
const base::android::JavaRef<jobject>& obj,
Profile* profile) {
PasswordUiViewAndroid* controller =
new PasswordUiViewAndroid(env, obj, profile);
return reinterpret_cast<intptr_t>(controller);
browser/password_manager/android/password_ui_view_android.h
+2 -2
View File
@@ -81,11 +81,11 @@ class PasswordUiViewAndroid
const base::android::JavaRef<jobject>& error_callback);
void HandleShowPasswordEntryEditingView(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& context,
const base::android::JavaRef<jobject>& context,
int index);
void HandleShowBlockedCredentialView(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& context,
const base::android::JavaRef<jobject>& context,
int index);
void HandleImportPasswordsFromCsv(
JNIEnv* env,
browser/password_manager/android/password_ui_view_android_unittest.cc
+4 -4
View File
@@ -44,7 +44,7 @@
namespace android {
using base::android::AttachCurrentThread;
using base::android::JavaParamRef;
using base::android::JavaRef;
using password_manager::PasswordForm;
using password_manager::TestPasswordStore;
@@ -128,7 +128,7 @@ TEST_F(PasswordUiViewAndroidTest, GetSerializedPasswords) {
std::unique_ptr<PasswordUiViewAndroid, PasswordUiViewAndroidDestroyDeleter>
password_ui_view(new PasswordUiViewAndroid(
env(), JavaParamRef<jobject>(nullptr), testing_profile_));
env(), JavaRef<jobject>(nullptr), testing_profile_));
// SavedPasswordsPresenter needs time to initialize and fetch passwords.
RunUntilIdle();
@@ -160,7 +160,7 @@ TEST_F(PasswordUiViewAndroidTest, GetSerializedPasswords_Cancelled) {
std::unique_ptr<PasswordUiViewAndroid, PasswordUiViewAndroidDestroyDeleter>
password_ui_view(new PasswordUiViewAndroid(
env(), JavaParamRef<jobject>(nullptr), testing_profile_));
env(), JavaRef<jobject>(nullptr), testing_profile_));
// SavedPasswordsPresenter needs time to initialize and fetch passwords.
RunUntilIdle();
@@ -188,7 +188,7 @@ TEST_F(PasswordUiViewAndroidTest, GetSerializedPasswords_WriteFailed) {
std::unique_ptr<PasswordUiViewAndroid, PasswordUiViewAndroidDestroyDeleter>
password_ui_view(new PasswordUiViewAndroid(
env(), JavaParamRef<jobject>(nullptr), testing_profile_));
env(), JavaRef<jobject>(nullptr), testing_profile_));
// SavedPasswordsPresenter needs time to initialize and fetch passwords.
RunUntilIdle();
browser/permissions/brave_dapp_permission_prompt_dialog_controller_android.cc
+1 -1
View File
@@ -52,7 +52,7 @@ void BraveDappPermissionPromptDialogController::ShowDialog() {
void BraveDappPermissionPromptDialogController::OnPrimaryButtonClicked(
JNIEnv* env,
const base::android::JavaParamRef<jobjectArray>& accounts,
const base::android::JavaRef<jobjectArray>& accounts,
int permission_lifetime_option) {
std::vector<std::string> allowedAccounts;
base::android::AppendJavaStringArrayToStringVector(env, accounts,
browser/permissions/brave_dapp_permission_prompt_dialog_controller_android.h
+1 -1
View File
@@ -40,7 +40,7 @@ class BraveDappPermissionPromptDialogController {
void OnPrimaryButtonClicked(
JNIEnv* env,
const base::android::JavaParamRef<jobjectArray>& accounts,
const base::android::JavaRef<jobjectArray>& accounts,
int permission_lifetime_option);
void OnNegativeButtonClicked(JNIEnv* env);
void OnDialogDismissed(JNIEnv* env);
browser/permissions/connect_account_android.cc
+3 -3
View File
@@ -38,10 +38,10 @@ void PlainCallConnectAccountCallback(
static void JNI_ConnectAccountFragment_ConnectAccount(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& java_account_address,
const base::android::JavaRef<jstring>& java_account_address,
jint account_id_coin,
const base::android::JavaParamRef<jobject>& java_web_contents,
const base::android::JavaParamRef<jobject>& callback) {
const base::android::JavaRef<jobject>& java_web_contents,
const base::android::JavaRef<jobject>& callback) {
base::android::ScopedJavaGlobalRef<jobject> java_callback;
java_callback.Reset(env, callback);
browser/playlist/android/playlist_service_factory_android.cc
+1 -1
View File
@@ -14,7 +14,7 @@ namespace chrome {
namespace android {
static jlong JNI_PlaylistServiceFactoryAndroid_GetInterfaceToPlaylistService(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& profile_android) {
const base::android::JavaRef<jobject>& profile_android) {
auto* profile = Profile::FromJavaObject(profile_android);
auto pending =
playlist::PlaylistServiceFactory::GetInstance()->GetRemoteForProfile(
browser/skus/android/skus_service_factory_android.cc
+1 -1
View File
@@ -15,7 +15,7 @@ namespace android {
static jlong JNI_SkusServiceFactory_GetInterfaceToSkusService(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& profile_android) {
const base::android::JavaRef<jobject>& profile_android) {
auto* profile = Profile::FromJavaObject(profile_android);
auto pending = mojo::PendingRemote<skus::mojom::SkusService>();
if (profile) {
browser/sync/brave_sync_devices_android.cc
+2 -2
View File
@@ -108,7 +108,7 @@ syncer::BraveSyncServiceImpl* BraveSyncDevicesAndroid::GetSyncService() const {
void BraveSyncDevicesAndroid::DeleteDevice(
JNIEnv* env,
const base::android::JavaParamRef<jstring>& device_guid) {
const base::android::JavaRef<jstring>& device_guid) {
std::string str_device_guid =
base::android::ConvertJavaStringToUTF8(device_guid);
auto* sync_service = GetSyncService();
@@ -124,7 +124,7 @@ void BraveSyncDevicesAndroid::DeleteDevice(
static void JNI_BraveSyncDevices_Init(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& jcaller) {
const base::android::JavaRef<jobject>& jcaller) {
new BraveSyncDevicesAndroid(env, jcaller);
}
browser/sync/brave_sync_devices_android.h
+1 -1
View File
@@ -34,7 +34,7 @@ class BraveSyncDevicesAndroid : public syncer::DeviceInfoTracker::Observer {
base::android::ScopedJavaLocalRef<jstring> GetSyncDeviceListJson(JNIEnv* env);
void DeleteDevice(JNIEnv* env,
const base::android::JavaParamRef<jstring>& device_guid);
const base::android::JavaRef<jstring>& device_guid);
private:
// syncer::DeviceInfoTracker::Observer
browser/url_sanitizer/android/url_sanitizer_service_factory_android.cc
+1 -1
View File
@@ -14,7 +14,7 @@ namespace chrome {
namespace android {
static jlong JNI_UrlSanitizerServiceFactory_GetInterfaceToUrlSanitizerService(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& profile_android) {
const base::android::JavaRef<jobject>& profile_android) {
auto* profile = Profile::FromJavaObject(profile_android);
auto pending =
brave::URLSanitizerServiceFactory::GetInstance()->GetRemoteForProfile(
browser/webcompat_reporter/android/webcompat_report_service_factory_android.cc
+1 -1
View File
@@ -16,7 +16,7 @@ namespace android {
static jlong
JNI_WebcompatReporterServiceFactory_GetInterfaceToWebcompatReporterService(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& profile_android) {
const base::android::JavaRef<jobject>& profile_android) {
auto* profile = Profile::FromJavaObject(profile_android);
auto pending =
webcompat_reporter::WebcompatReporterServiceFactory::GetInstance()
chromium_src/chrome/browser/bookmarks/android/bookmark_bridge.cc
+8 -9
View File
@@ -32,7 +32,7 @@ using BraveBookmarkBridge = BookmarkBridge;
#include <chrome/browser/bookmarks/android/bookmark_bridge.cc>
using base::android::JavaParamRef;
using base::android::JavaRef;
using user_data_importer::BookmarkParser;
using user_data_importer::ContentBookmarkParser;
using user_data_importer::SearchEngineInfo;
@@ -122,9 +122,9 @@ std::unique_ptr<TemplateURL> CreateTemplateURL(const std::u16string& url,
void BookmarkBridge::ImportBookmarks(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& obj,
const base::android::JavaParamRef<jobject>& java_window,
const base::android::JavaParamRef<jstring>& j_import_path) {
const base::android::JavaRef<jobject>& obj,
const base::android::JavaRef<jobject>& java_window,
const base::android::JavaRef<jstring>& j_import_path) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
ui::WindowAndroid* window =
ui::WindowAndroid::FromJavaWindowAndroid(java_window);
@@ -189,11 +189,10 @@ void BookmarkBridge::OnParseFinished(
Java_BraveBookmarkBridge_bookmarksImported(env, obj, import_succeeded);
}
void BookmarkBridge::ExportBookmarks(
JNIEnv* env,
const JavaParamRef<jobject>& obj,
const JavaParamRef<jobject>& java_window,
const JavaParamRef<jstring>& j_export_path) {
void BookmarkBridge::ExportBookmarks(JNIEnv* env,
const JavaRef<jobject>& obj,
const JavaRef<jobject>& java_window,
const JavaRef<jstring>& j_export_path) {
DCHECK(IsLoaded());
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
chromium_src/chrome/browser/bookmarks/android/bookmark_bridge.h
+12 -13
View File
@@ -14,19 +14,18 @@ namespace user_data_importer {
class ContentBookmarkParser;
} // namespace user_data_importer
#define SetReadStatus \
ImportBookmarks( \
JNIEnv* env, const base::android::JavaParamRef<jobject>& obj, \
const base::android::JavaParamRef<jobject>& java_window, \
const base::android::JavaParamRef<jstring>& import_file_path); \
void OnParseFinished( \
user_data_importer::BookmarkParser::BookmarkParsingResult result); \
base::SequenceBound<user_data_importer::ContentBookmarkParser> \
bookmark_parser_; \
void ExportBookmarks( \
JNIEnv* env, const base::android::JavaParamRef<jobject>& obj, \
const base::android::JavaParamRef<jobject>& java_window, \
const base::android::JavaParamRef<jstring>& export_file_path); \
#define SetReadStatus \
ImportBookmarks(JNIEnv* env, const base::android::JavaRef<jobject>& obj, \
const base::android::JavaRef<jobject>& java_window, \
const base::android::JavaRef<jstring>& import_file_path); \
void OnParseFinished( \
user_data_importer::BookmarkParser::BookmarkParsingResult result); \
base::SequenceBound<user_data_importer::ContentBookmarkParser> \
bookmark_parser_; \
void ExportBookmarks( \
JNIEnv* env, const base::android::JavaRef<jobject>& obj, \
const base::android::JavaRef<jobject>& java_window, \
const base::android::JavaRef<jstring>& export_file_path); \
void SetReadStatus
#include <chrome/browser/bookmarks/android/bookmark_bridge.h> // IWYU pragma: export
chromium_src/components/browser_ui/site_settings/android/website_preference_bridge.cc
+2 -2
View File
@@ -35,8 +35,8 @@
// class redefinition issues. So we use [[maybe_unused]] to suppress the error.
[[maybe_unused]] static void JNI_WebsitePreferenceBridge_ClearCookieData(
JNIEnv* env,
const jni_zero::JavaParamRef<jobject>& jbrowser_context_handle,
const jni_zero::JavaParamRef<jstring>& jorigin) {
const jni_zero::JavaRef<jobject>& jbrowser_context_handle,
const jni_zero::JavaRef<jstring>& jorigin) {
JNI_WebsitePreferenceBridge_ClearCookieData_ChromiumImpl(
env, jbrowser_context_handle, jorigin);
chromium_src/components/external_intents/android/intercept_navigation_delegate_impl.cc
+2 -2
View File
@@ -80,8 +80,8 @@ class BraveInterceptNavigationDelegate : public InterceptNavigationDelegate {
[[maybe_unused]] static void
JNI_InterceptNavigationDelegateImpl_AssociateWithWebContents(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& jdelegate,
const base::android::JavaParamRef<jobject>& jweb_contents) {
const base::android::JavaRef<jobject>& jdelegate,
const base::android::JavaRef<jobject>& jweb_contents) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
content::WebContents* web_contents =
content::WebContents::FromJavaWebContents(jweb_contents);
chromium_src/components/sync/android/sync_service_android_bridge.cc
+1 -1
View File
@@ -28,6 +28,6 @@ namespace syncer {
// To avoid this, override with empty implementation.
void SyncServiceAndroidBridge::KeepAccountSettingsPrefsOnlyForUsers(
JNIEnv* env,
const base::android::JavaParamRef<jobjectArray>& gaia_ids) {}
const base::android::JavaRef<jobjectArray>& gaia_ids) {}
} // namespace syncer
chromium_src/components/sync/android/sync_service_android_bridge.h
+3 -3
View File
@@ -6,9 +6,9 @@
#ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_SYNC_ANDROID_SYNC_SERVICE_ANDROID_BRIDGE_H_
#define BRAVE_CHROMIUM_SRC_COMPONENTS_SYNC_ANDROID_SYNC_SERVICE_ANDROID_BRIDGE_H_
#define KeepAccountSettingsPrefsOnlyForUsers \
KeepAccountSettingsPrefsOnlyForUsers_Unused( \
JNIEnv* env, const base::android::JavaParamRef<jobjectArray>& gaia_ids); \
#define KeepAccountSettingsPrefsOnlyForUsers \
KeepAccountSettingsPrefsOnlyForUsers_Unused( \
JNIEnv* env, const base::android::JavaRef<jobjectArray>& gaia_ids); \
void KeepAccountSettingsPrefsOnlyForUsers
#include <components/sync/android/sync_service_android_bridge.h> // IWYU pragma: export
docs/keyed_services.md
+1 -1
View File
@@ -116,7 +116,7 @@ void ExampleServiceFactory::BindRemoteForProfile(
static jlong JNI_ExampleService_GetForProfile(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& profile_android) {
const base::android::JavaRef<jobject>& profile_android) {
auto* profile = Profile::FromJavaObject(profile_android);
auto pending =
ExampleServiceFactory::GetInstance()->GetRemoteService(profile);