Merge pull request #45 from uazo/create-pull-request/patch-0c9be22
Git apply result for next-v111 branch
This commit is contained in:
@@ -127,7 +127,7 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resourc
|
||||
diff --git a/chrome/browser/resources/settings/router.ts b/chrome/browser/resources/settings/router.ts
|
||||
--- a/chrome/browser/resources/settings/router.ts
|
||||
+++ b/chrome/browser/resources/settings/router.ts
|
||||
@@ -104,6 +104,7 @@ export interface SettingsRoutes {
|
||||
@@ -105,6 +105,7 @@ export interface SettingsRoutes {
|
||||
SITE_SETTINGS_TIMEZONE_OVERRIDE: Route;
|
||||
SITE_SETTINGS_WEBGL: Route;
|
||||
SITE_SETTINGS_WEBRTC: Route;
|
||||
|
||||
@@ -105,7 +105,7 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resourc
|
||||
diff --git a/chrome/browser/resources/settings/router.ts b/chrome/browser/resources/settings/router.ts
|
||||
--- a/chrome/browser/resources/settings/router.ts
|
||||
+++ b/chrome/browser/resources/settings/router.ts
|
||||
@@ -102,6 +102,7 @@ export interface SettingsRoutes {
|
||||
@@ -103,6 +103,7 @@ export interface SettingsRoutes {
|
||||
SITE_SETTINGS_AUTOPLAY: Route;
|
||||
SITE_SETTINGS_JAVASCRIPT_JIT: Route;
|
||||
SITE_SETTINGS_TIMEZONE_OVERRIDE: Route;
|
||||
|
||||
@@ -104,7 +104,7 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resourc
|
||||
diff --git a/chrome/browser/resources/settings/router.ts b/chrome/browser/resources/settings/router.ts
|
||||
--- a/chrome/browser/resources/settings/router.ts
|
||||
+++ b/chrome/browser/resources/settings/router.ts
|
||||
@@ -103,6 +103,7 @@ export interface SettingsRoutes {
|
||||
@@ -104,6 +104,7 @@ export interface SettingsRoutes {
|
||||
SITE_SETTINGS_JAVASCRIPT_JIT: Route;
|
||||
SITE_SETTINGS_TIMEZONE_OVERRIDE: Route;
|
||||
SITE_SETTINGS_WEBGL: Route;
|
||||
|
||||
@@ -105,7 +105,7 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resourc
|
||||
diff --git a/chrome/browser/resources/settings/router.ts b/chrome/browser/resources/settings/router.ts
|
||||
--- a/chrome/browser/resources/settings/router.ts
|
||||
+++ b/chrome/browser/resources/settings/router.ts
|
||||
@@ -100,6 +100,7 @@ export interface SettingsRoutes {
|
||||
@@ -101,6 +101,7 @@ export interface SettingsRoutes {
|
||||
SYSTEM: Route;
|
||||
TRIGGERED_RESET_DIALOG: Route;
|
||||
SITE_SETTINGS_AUTOPLAY: Route;
|
||||
|
||||
@@ -104,7 +104,7 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resourc
|
||||
diff --git a/chrome/browser/resources/settings/router.ts b/chrome/browser/resources/settings/router.ts
|
||||
--- a/chrome/browser/resources/settings/router.ts
|
||||
+++ b/chrome/browser/resources/settings/router.ts
|
||||
@@ -99,6 +99,7 @@ export interface SettingsRoutes {
|
||||
@@ -100,6 +100,7 @@ export interface SettingsRoutes {
|
||||
SYNC_ADVANCED: Route;
|
||||
SYSTEM: Route;
|
||||
TRIGGERED_RESET_DIALOG: Route;
|
||||
|
||||
@@ -105,7 +105,7 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resourc
|
||||
diff --git a/chrome/browser/resources/settings/router.ts b/chrome/browser/resources/settings/router.ts
|
||||
--- a/chrome/browser/resources/settings/router.ts
|
||||
+++ b/chrome/browser/resources/settings/router.ts
|
||||
@@ -101,6 +101,7 @@ export interface SettingsRoutes {
|
||||
@@ -102,6 +102,7 @@ export interface SettingsRoutes {
|
||||
TRIGGERED_RESET_DIALOG: Route;
|
||||
SITE_SETTINGS_AUTOPLAY: Route;
|
||||
SITE_SETTINGS_JAVASCRIPT_JIT: Route;
|
||||
|
||||
Reference in New Issue
Block a user