Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade from Chromium 78.0.3904.108 to Chromium 79.0.3945.56 (1.1.x) #4119

Merged
merged 7 commits into from
Dec 4, 2019
Merged

Upgrade from Chromium 78.0.3904.108 to Chromium 79.0.3945.56 (1.1.x) #4119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
474ae0b
Merge pull request #3890 from brave/rebranding_password_manager_strings
simonhong Nov 9, 2019
4e2b166
Merge pull request #3990 from brave/maxk-fix-missing-grdp
mkarolin Nov 20, 2019
465ffe7
Merge pull request #3645 from brave/ie_bye_url_request
iefremov Oct 20, 2019
80d946b
Merge pull request #4091 from brave/79.0.3945.56
bsclifton Dec 2, 2019
8fa87c7
Fixes crash in BookmarksApiUnittest.Update unit test.
mkarolin Dec 3, 2019
2277768
Merge pull request #4122 from brave/maxk-fix-mac-signing-postC79
mkarolin Dec 3, 2019
4c140ee
Merge pull request #4129 from brave/issue_7194
mbacchi Dec 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 6 additions & 3 deletions android/java/org/chromium/chrome/browser/appmenu/BraveAppMenuPropertiesDelegateImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import org.chromium.base.Log;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.ActivityTabProvider;
import org.chromium.chrome.browser.bookmarks.BookmarkBridge;
import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
import org.chromium.chrome.browser.multiwindow.MultiWindowModeStateDispatcher;
import org.chromium.chrome.browser.tabmodel.TabModelSelector;
Expand All @@ -23,12 +24,14 @@
public class BraveAppMenuPropertiesDelegateImpl extends AppMenuPropertiesDelegateImpl {
private Menu mMenu;

public BraveAppMenuPropertiesDelegateImpl(Context context, ActivityTabProvider activityTabProvider,
public BraveAppMenuPropertiesDelegateImpl(Context context,
ActivityTabProvider activityTabProvider,
MultiWindowModeStateDispatcher multiWindowModeStateDispatcher,
TabModelSelector tabModelSelector, ToolbarManager toolbarManager, View decorView,
@Nullable ObservableSupplier<OverviewModeBehavior> overviewModeBehaviorSupplier) {
@Nullable ObservableSupplier<OverviewModeBehavior> overviewModeBehaviorSupplier,
ObservableSupplier<BookmarkBridge> bookmarkBridgeSupplier) {
super(context, activityTabProvider, multiWindowModeStateDispatcher, tabModelSelector,
toolbarManager, decorView, overviewModeBehaviorSupplier);
toolbarManager, decorView, overviewModeBehaviorSupplier, bookmarkBridgeSupplier);
}

@Override
Expand Down
19 changes: 12 additions & 7 deletions android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,14 @@
import org.chromium.base.ContextUtils;
import org.chromium.base.annotations.CalledByNative;
import org.chromium.components.signin.AccountTrackerService;
import org.chromium.components.signin.identitymanager.IdentityManager;
import org.chromium.components.signin.identitymanager.IdentityMutator;
import org.chromium.components.sync.AndroidSyncSettings;

public class BraveSigninManager extends SigninManager {
BraveSigninManager(Context context, long nativeSigninManagerAndroid,
AccountTrackerService accountTrackerService) {
super(context, nativeSigninManagerAndroid, accountTrackerService,
BraveSigninManager(long nativeSigninManagerAndroid, AccountTrackerService accountTrackerService,
IdentityManager identityManager, IdentityMutator identityMutator) {
super(nativeSigninManagerAndroid, accountTrackerService, identityManager, identityMutator,
AndroidSyncSettings.get());
}

Expand All @@ -30,11 +32,14 @@ public boolean isSigninSupported() {
}

@CalledByNative
private static SigninManager create(
long nativeSigninManagerAndroid, AccountTrackerService accountTrackerService) {
private static SigninManager create(long nativeSigninManagerAndroid,
AccountTrackerService accountTrackerService, IdentityManager identityManager,
IdentityMutator identityMutator) {
assert nativeSigninManagerAndroid != 0;
assert accountTrackerService != null;
return new BraveSigninManager(ContextUtils.getApplicationContext(),
nativeSigninManagerAndroid, accountTrackerService);
assert identityManager != null;
assert identityMutator != null;
return new BraveSigninManager(nativeSigninManagerAndroid, accountTrackerService,
identityManager, identityMutator);
}
}
4 changes: 2 additions & 2 deletions android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@
import org.chromium.chrome.browser.tabmodel.TabModelSelectorTabObserver;
import org.chromium.chrome.browser.tabmodel.TabSelectionType;
import org.chromium.chrome.browser.toolbar.top.ToolbarLayout;
import org.chromium.chrome.browser.util.AccessibilityUtil;
import org.chromium.chrome.browser.util.MathUtils;
import org.chromium.ui.interpolators.BakedBezierInterpolator;
import org.chromium.ui.widget.Toast;

import java.net.URL;
import java.util.List;
Expand Down Expand Up @@ -209,7 +209,7 @@ public boolean onLongClick(View v) {
description = resources.getString(R.string.accessibility_toolbar_btn_brave_rewards);
}*/

return AccessibilityUtil.showAccessibilityToast(context, v, description);
return Toast.showAnchoredToast(context, v, description);
}

public void populateUrlAnimatorSet(boolean hasFocus, int urlFocusToolbarButtonsDuration,
Expand Down
193 changes: 53 additions & 140 deletions android/java/strings/android_chrome_strings.grd
View file
Open in desktop

Large diffs are not rendered by default.

77 changes: 77 additions & 0 deletions android/java/strings/translations/android_brave_strings_am.xtb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="am">
<translation id="6303294677342628402">መከላከያዎች</translation>
<translation id="6132506775968708399">የ3ኛ ወገን ኩኪ ይከላከሉ</translation>
<translation id="520895744850022668">HTTPS በሁሉም ቦተታ</translation>
<translation id="94154759592465111">ስክሪፕቶችን ዝጋ</translation>
<translation id="7458422973722236530">የጣት አሻራ ጥበቃ</translation>
<translation id="2313532038420432247">HTTPS ማዘመን</translation>
<translation id="7461425058443653485">ስክሪፕቶች ተዘግተዋል</translation>
<translation id="1506061864768559482">የፍለጋ ፕሮግራም</translation>
<translation id="9148058034647219655">ውጣ</translation>
<translation id="4339730410920731698">ማስታወቅያና መከታተያዎች ተዘግተዋል</translation>
<translation id="59174027418879706">ነቅቷል</translation>
<translation id="4176463684765177261">ተሰናክሏል</translation>
<translation id="4150201353443180367">ማሳያ</translation>
<translation id="2433507940547922241">ገጽታ</translation>
<translation id="5916664084637901428">በርቷል</translation>
<translation id="5860033963881614850">አጥፋ</translation>
<translation id="8281886186245836920">ዝለል</translation>
<translation id="7053983685419859001">አግድ</translation>
<translation id="3333887201479867589">ናይ Brave ሽልማታት</translation>
<translation id="4281844954008187215">የአገልግሎት ውል</translation>
<translation id="4930714375720679147">አብራ</translation>
<translation id="2453860139492968684">ጨርስ</translation>
<translation id="2359808026110333948">ቀጥል</translation>
<translation id="7658239707568436148">ሰርዝ</translation>
<translation id="7136694880210472378">ነባሪ አድርግ</translation>
<translation id="4250680216510889253">አይ</translation>
<translation id="1426410128494586442">አዎ</translation>
<translation id="8826007068782654809">እናመሰግናለን</translation>
<translation id="6665366815203065060">አሁን ጉርሻ ሰጥተዋል ለ:</translation>
<translation id="5441565662498481293">ጉርሻ በራስ-ሰር እየላኩ ነው ለ:</translation>
<translation id="1166682575529520472">በየወሩ</translation>
<translation id="1628742278973105368">የመጀመሪያው ወርሃዊ ጉርሻዎን በሚከተለው ላይ ይላካሉ:</translation>
<translation id="1704859330137112950">ይህን ገፅ በተከታታይ ለማገዝ ከፈለጉ ወርሀዊ ምክሮችን መርሀግብር መያዝ ይችላሉ፡፡</translation>
<translation id="245015745140252435">የምክር መጠን</translation>
<translation id="3250511771491660127">ይህን ወርሀዊ ያድርጉት</translation>
<translation id="3780605330121608425">ኪስዎ</translation>
<translation id="8845154268466251503">BAT</translation>
<translation id="2104073734684466851">ብድሮች</translation>
<translation id="1165667598801520610">የማስታወቅያ ፈንድ</translation>
<translation id="8428213095426709021">ቅንብሮች</translation>
<translation id="8772672608371898774">ብሬቭ አሳታሚዉን አረጋግጧል</translation>
<translation id="1397683270551078781">ገና አልተረጋገጠም</translation>
<translation id="9182287025588539628">አንድ ግዜ ምክሮች</translation>
<translation id="7577100371127227294">ወርሓዊ መረጃዎች</translation>
<translation id="3074127054582480056">ትኩረት</translation>
<translation id="4914597931214386232">የቶክን ብድር ተጠይቋል</translation>
<translation id="298067735430872465">እባክዎ ከማስተዋቅያ ያግኙ</translation>
<translation id="6112368337882254910">የራስ-አስተዋፅዎ</translation>
<translation id="13853865024308201">አቤቱታ</translation>
<translation id="7335371657242627509">ራስን አስተዋጽኦ ማድረግ መጨመር</translation>
<translation id="5463954686005964104">ይህን ገፅ በወር ምክር ይስጡ</translation>
<translation id="7530570094705720669">ቋት መፍጠር</translation>
<translation id="2429828319207652823">የእርስዎን አስተዋፅኦ በማካሄድ ላይ ችግር ነበር</translation>
<translation id="3453206261112715431">ነፃ የቶክን ብድር</translation>
<translation id="6417420737057016607">የብሬቭ ማስታቂያዎች</translation>
<translation id="606865182719489911">ነፃ የቶክን ብድር ይገኛል፡፡</translation>
<translation id="7550470870580166294">በቂ ያልሆነ ተቀማጭ</translation>
<translation id="2775064702681588061">የእርስዎ Brave Rewards መለያ ተቀማጭ ገንዘብ በመጠባበቅ ላይ ነው።</translation>
<translation id="765834632354589737">የምትኬ ዋሌት</translation>
<translation id="1713542052890184975">እባክዎትን ለBrave walletዎ ምትኬ ያድርጉ።</translation>
<translation id="2323069945529668668">ውይ!</translation>
<translation id="7510166204621526816">የብሬቭ ሽልማት ሰርቨር እየሰራ አይደለም፡፡ ይህንን በተቻለን ፍጥነት እናስተካክላለን፡፡</translation>
<translation id="4292832015778676417">ከማስታወቂያዎች የተገኘ</translation>
<translation id="1036277985068412734">ፈንድ ይጨምሩ</translation>
<translation id="3149880132460839085">የብሬቭ ማመሳሰል</translation>
<translation id="3680755684186855422">የብሬቭ ማመሳሰል በተለያዩ መሳሪያዎች ላይ በብሬቭ አሳሾችዎ መካከል የዕልባቶችዎን ውሂብ በግል እንዲያመሳስሉ ያስችልዎታል፡፡</translation>
<translation id="5241263629636958324">ወደ ቅንጥብ ሰሌዳ ተገልብጧል</translation>
<translation id="5817918615728894473">አጣምር</translation>
<translation id="1602067095281698985">አዲስ የማመሳሰል ሰንሰለት ይጀምሩ</translation>
<translation id="2175927920773552910">QR ኮድ</translation>
<translation id="8730621377337864115">ተጠናቅቋል</translation>
<translation id="8131740175452115882">አረጋግጥ</translation>
<translation id="8050847734948770789">የብሬቭ ሽልማት ያብሩ</translation>
</translationbundle>
77 changes: 77 additions & 0 deletions android/java/strings/translations/android_brave_strings_ar.xtb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<?xml version="1.0" ?>
<!DOCTYPE translationbundle>
<translationbundle lang="ar">
<translation id="6303294677342628402">طرق الحماية</translation>
<translation id="6132506775968708399">حظر ملفات تعريف الارتباط الخاصة بالجهات الخارجية</translation>
<translation id="520895744850022668">HTTPS في كل مكان</translation>
<translation id="94154759592465111">حظر البرامج النصية</translation>
<translation id="7458422973722236530">حماية البصمات</translation>
<translation id="2313532038420432247">ترقيات HTTPS</translation>
<translation id="7461425058443653485">البرامج النصية المحظورة</translation>
<translation id="1506061864768559482">محرك البحث</translation>
<translation id="9148058034647219655">إنهاء</translation>
<translation id="4339730410920731698">تمَّ حجب الإعلانات والتعقب</translation>
<translation id="59174027418879706">تم التمكين</translation>
<translation id="4176463684765177261">غير مفعّل</translation>
<translation id="4150201353443180367">عرض</translation>
<translation id="2433507940547922241">المظهر</translation>
<translation id="5916664084637901428">تشغيل</translation>
<translation id="5860033963881614850">مقفل</translation>
<translation id="8281886186245836920">تخطّي</translation>
<translation id="7053983685419859001">حجب</translation>
<translation id="3333887201479867589">مكافآت Brave</translation>
<translation id="4281844954008187215">شروط الخدمة</translation>
<translation id="4930714375720679147">تفعيل</translation>
<translation id="2453860139492968684">اكتمل</translation>
<translation id="2359808026110333948">متابعة</translation>
<translation id="7658239707568436148">إلغاء</translation>
<translation id="7136694880210472378">تعيين كافتراضي</translation>
<translation id="4250680216510889253">لا</translation>
<translation id="1426410128494586442">نعم</translation>
<translation id="8826007068782654809">شكراً لك</translation>
<translation id="6665366815203065060">تم إرسال إكراميتك للتو إلى:</translation>
<translation id="5441565662498481293">إنك ترسل الإكراميات تلقائيًا إلى:</translation>
<translation id="1166682575529520472">شهريًا</translation>
<translation id="1628742278973105368">سيتم إرسال إكراميتك الشهرية الأولى في:</translation>
<translation id="1704859330137112950">إذا كنت ترغب في ذلك، يمكنك جدولة مكافآت شهرية لدعم هذا الموقع على أساس مستمر.</translation>
<translation id="245015745140252435">مبلغ المكافأة</translation>
<translation id="3250511771491660127">اجعل هذا شهرياً</translation>
<translation id="3780605330121608425">محفظتك</translation>
<translation id="8845154268466251503">صيغة BAT</translation>
<translation id="2104073734684466851">المنح</translation>
<translation id="1165667598801520610">إضافة أموال</translation>
<translation id="8428213095426709021">الإعدادات</translation>
<translation id="8772672608371898774">ناشر تم التحقق منه لدى Brave</translation>
<translation id="1397683270551078781">لم يقم بتأكيد حسابه بعد</translation>
<translation id="9182287025588539628">مكافآت لمرة واحدة</translation>
<translation id="7577100371127227294">المكافآت الشهرية</translation>
<translation id="3074127054582480056">تنبيه</translation>
<translation id="4914597931214386232">تم جمع المكافأة المالية التي منحت لك</translation>
<translation id="298067735430872465">أرباح من الإعلانات</translation>
<translation id="6112368337882254910">مساهمة تلقائية</translation>
<translation id="13853865024308201">الحصول عليها</translation>
<translation id="7335371657242627509">تضمين في المساهمة التلقائية</translation>
<translation id="5463954686005964104">امنح المال لهذا الموقع شهرياً</translation>
<translation id="7530570094705720669">إنشاء محفظة</translation>
<translation id="2429828319207652823">كانت هناك مشكلة في معالجة مساهمتك.</translation>
<translation id="3453206261112715431">الحصول على أموال مجانًا</translation>
<translation id="6417420737057016607">إعلانات Brave</translation>
<translation id="606865182719489911">تتوفر منحة رموز مجانية.</translation>
<translation id="7550470870580166294">الرصيد لا يكفي</translation>
<translation id="2775064702681588061">ينتظر حساب Brave Rewards الخاص بك إيداعًا.</translation>
<translation id="765834632354589737">عمل نسخة احتياطية عن المحفظة</translation>
<translation id="1713542052890184975">يرجى عمل نسخة احتياطية عن محفظة Brave الخاصة بك.</translation>
<translation id="2323069945529668668">آه!</translation>
<translation id="7510166204621526816">خادم مكافآت Brave لا يستجيب. سوف نصلح هذا في أقرب وقت ممكن.</translation>
<translation id="4292832015778676417">المكتسب من الإعلانات</translation>
<translation id="1036277985068412734">إضافة الأموال.</translation>
<translation id="3149880132460839085">مزامنة Brave</translation>
<translation id="3680755684186855422">تتيح لك مزامنة Brave إمكانية مزامنة بيانات الإشارات المرجعية بشكل خاص بين متصفحات Brave الخاصة بك على أجهزتك المختلفة.</translation>
<translation id="5241263629636958324">تم النسخ إلى الحافظة</translation>
<translation id="5817918615728894473">إقران</translation>
<translation id="1602067095281698985">بدء سلسلة مزامنة جديدة</translation>
<translation id="2175927920773552910">رمز الاستجابة السريعة</translation>
<translation id="8730621377337864115">تم</translation>
<translation id="8131740175452115882">التأكيد</translation>
<translation id="8050847734948770789">تمكين مكافآت Brave</translation>
</translationbundle>
Loading