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.2.x) #4117

Merged
merged 5 commits into from
Dec 4, 2019
Merged

Upgrade from Chromium 78.0.3904.108 to Chromium 79.0.3945.56 (1.2.x) #4117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c32864b
Merge pull request #3890 from brave/rebranding_password_manager_strings
simonhong Nov 9, 2019
ad9c267
Merge pull request #3990 from brave/maxk-fix-missing-grdp
mkarolin Nov 20, 2019
6bd56fe
Merge pull request #4091 from brave/79.0.3945.56
bsclifton Dec 2, 2019
9e1e1bd
Merge pull request #4122 from brave/maxk-fix-mac-signing-postC79
mkarolin Dec 3, 2019
2809e69
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
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion android/java/org/chromium/chrome/browser/BraveRewardsHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import org.chromium.chrome.browser.favicon.LargeIconBridge;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.tabmodel.TabModelImpl;
import org.chromium.chrome.browser.widget.RoundedIconGenerator;
import org.chromium.chrome.browser.ui.widget.RoundedIconGenerator;
import org.chromium.chrome.R;


Expand Down
2 changes: 1 addition & 1 deletion android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import android.graphics.Bitmap;
import android.widget.ImageView;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.widget.RoundedIconGenerator;
import org.chromium.chrome.browser.ui.widget.RoundedIconGenerator;
import org.chromium.base.task.AsyncTask;
import android.graphics.BitmapFactory;
import org.chromium.base.annotations.CalledByNative;
Expand Down
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.ObservableSupplier;
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.notifications.BraveSetDefaultBrowserNotificationService;
Expand All @@ -24,12 +25,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
2 changes: 1 addition & 1 deletion android/java/org/chromium/chrome/browser/notifications/BraveAdsNotificationBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ private void addWorkProfileBadge(RemoteViews view) {

Drawable inputDrawable = new BitmapDrawable(resources, bitmap);
Drawable outputDrawable = ApiCompatibilityUtils.getUserBadgedDrawableForDensity(
mContext, inputDrawable, null /* badgeLocation */, metrics.densityDpi);
inputDrawable, null /* badgeLocation */, metrics.densityDpi);

// The input bitmap is immutable, so the output drawable will be a different instance from
// the input drawable if the work profile badge was applied.
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 @@ -46,9 +46,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 @@ -254,7 +254,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
Loading