46 lines
2.8 KiB
Diff
46 lines
2.8 KiB
Diff
diff --git a/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/channels/ChromeChannelDefinitions.java b/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/channels/ChromeChannelDefinitions.java
|
|
index 740cc12e93ab648041a65d1db60bbec4ae0228e2..38d624af6e3ad953e714faa4dd7eaeffcc179fee 100644
|
|
--- a/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/channels/ChromeChannelDefinitions.java
|
|
+++ b/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/channels/ChromeChannelDefinitions.java
|
|
@@ -36,6 +36,7 @@ import java.util.Set;
|
|
* <br/>
|
|
* See the README.md in this directory for more information before adding or changing any channels.
|
|
*/
|
|
+@android.annotation.SuppressLint("WrongConstant")
|
|
@RequiresApi(Build.VERSION_CODES.O)
|
|
public class ChromeChannelDefinitions extends ChannelDefinitions {
|
|
/**
|
|
@@ -69,6 +70,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions {
|
|
* more detailed instructions.
|
|
*/
|
|
@StringDef({ChannelId.BROWSER, ChannelId.DOWNLOADS, ChannelId.INCOGNITO,
|
|
+ BraveChannelDefinitions.ChannelId.BRAVE_ADS, BraveChannelDefinitions.ChannelId.BRAVE_ADS_BACKGROUND,
|
|
ChannelId.MEDIA_PLAYBACK, ChannelId.SCREEN_CAPTURE, ChannelId.CONTENT_SUGGESTIONS,
|
|
ChannelId.WEBAPP_ACTIONS, ChannelId.SITES, ChannelId.SHARING, ChannelId.UPDATES,
|
|
ChannelId.COMPLETED_DOWNLOADS, ChannelId.PERMISSION_REQUESTS,
|
|
@@ -103,7 +105,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions {
|
|
String USB = "usb";
|
|
}
|
|
|
|
- @StringDef({ChannelGroupId.GENERAL, ChannelGroupId.SITES})
|
|
+ @StringDef({BraveChannelDefinitions.ChannelGroupId.BRAVE_ADS, ChannelGroupId.GENERAL, ChannelGroupId.SITES})
|
|
@Retention(RetentionPolicy.SOURCE)
|
|
public @interface ChannelGroupId {
|
|
String SITES = "sites";
|
|
@@ -132,6 +134,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions {
|
|
Map<String, PredefinedChannel> map = new HashMap<>();
|
|
Set<String> startup = new HashSet<>();
|
|
|
|
+ BraveChannelDefinitions.addBraveChannels(map, startup);
|
|
map.put(ChannelId.BROWSER,
|
|
PredefinedChannel.create(ChannelId.BROWSER,
|
|
R.string.notification_category_browser,
|
|
@@ -281,6 +284,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions {
|
|
static final Map<String, PredefinedChannelGroup> MAP;
|
|
static {
|
|
Map<String, PredefinedChannelGroup> map = new HashMap<>();
|
|
+ BraveChannelDefinitions.addBraveChannelGroups(map);
|
|
map.put(ChannelGroupId.GENERAL,
|
|
new PredefinedChannelGroup(
|
|
ChannelGroupId.GENERAL, R.string.notification_category_group_general));
|