Update to 63.0.3239.30

Author: kuoruan

app/src/main/assets/en-US.pak

@@ -26,7 +26,7 @@ public class ResourceExtractor {
     private static final String TAG = "base";
     private static final String ICU_DATA_FILENAME = "icudtl.dat";
     private static final String V8_NATIVES_DATA_FILENAME = "natives_blob.bin";
-    private static final String V8_SNAPSHOT_DATA_FILENAME = "snapshot_blob.bin";
+    private static final String V8_SNAPSHOT_DATA_FILENAME = "snapshot_blob_32.bin";
     private static final String FALLBACK_LOCALE = "en-US";
 
     private class ExtractTask extends AsyncTask<Void, Void, Void> {

app/src/main/assets/resources.pak

@@ -8,5 +8,5 @@ public class NativeLibraries {
     public static final String[] LIBRARIES =
       {"chrome"};
     static String sVersionNumber =
-      "63.0.3239.18";
+      "63.0.3239.30";
 }

app/src/main/assets/zh-CN.pak

@@ -64,8 +64,8 @@ public Bitmap getBitmap(String pageUrl, Bitmap largestFavicon) {
         }
 
         if (mGenerator == null) {
-            mGenerator = new RoundedIconGenerator(mContext, APP_ICON_SIZE_DP, APP_ICON_SIZE_DP,
-                    APP_ICON_CORNER_RADIUS_DP, APP_ICON_DEFAULT_BACKGROUND_COLOR,
+            mGenerator = new RoundedIconGenerator(mContext.getResources(), APP_ICON_SIZE_DP,
+                    APP_ICON_SIZE_DP, APP_ICON_CORNER_RADIUS_DP, APP_ICON_DEFAULT_BACKGROUND_COLOR,
                     APP_ICON_TEXT_SIZE_DP);
         }
 

app/src/main/assets/zh-TW.pak

@@ -81,13 +81,6 @@ public abstract class ChromeSwitches {
      */
     public static final String DISABLE_TAB_MERGING_FOR_TESTING = "disable-tab-merging";
 
-    /**
-     * Force-enable partner customization for testing.
-     * Partner customization includes configurations from PartnerBookmarksProvider and
-     * PartnerBrowserCustomizations.
-     */
-    public static final String ALLOW_PARTNER_CUSTOMIZATION = "allow-partner-customization";
-
     ///////////////////////////////////////////////////////////////////////////////////////////////
     // Native Switches
     ///////////////////////////////////////////////////////////////////////////////////////////////

app/src/main/java/org/chromium/base/ResourceExtractor.java

@@ -6,7 +6,7 @@
 
 class ChromeVersionConstants {
     static final String PRODUCT_NAME = "Chromium";
-    static final String PRODUCT_VERSION = "63.0.3239.18";
+    static final String PRODUCT_VERSION = "63.0.3239.30";
     static final boolean IS_OFFICIAL_BUILD = 1 == 1;
 
     static final int PRODUCT_MAJOR_VERSION = 63;

app/src/main/java/org/chromium/base/library_loader/NativeLibraries.java

@@ -52,6 +52,10 @@ public BookmarkActionBar(Context context, AttributeSet attrs) {
                 .setTitle(R.string.bookmark_action_bar_move);
         getMenu().findItem(R.id.selection_mode_delete_menu_id)
                 .setTitle(R.string.bookmark_action_bar_delete);
+
+        // Wait to enable the selection mode group until the BookmarkDelegate is set. The
+        // SelectionDelegate is retrieved from the BookmarkDelegate.
+        getMenu().setGroupEnabled(R.id.selection_mode_menu_group, false);
     }
 
     @Override
@@ -68,7 +72,6 @@ public void onNavigationBack() {
     public boolean onMenuItemClick(MenuItem menuItem) {
         hideOverflowMenu();
 
-        SelectionDelegate<BookmarkId> selectionDelegate = mDelegate.getSelectionDelegate();
         if (menuItem.getItemId() == R.id.edit_menu_id) {
             BookmarkAddEditFolderActivity.startEditFolderActivity(getContext(),
                     mCurrentFolder.getId());
@@ -79,7 +82,10 @@ public boolean onMenuItemClick(MenuItem menuItem) {
         } else if (menuItem.getItemId() == R.id.search_menu_id) {
             mDelegate.openSearchUI();
             return true;
-        } else if (menuItem.getItemId() == R.id.selection_mode_edit_menu_id) {
+        }
+
+        SelectionDelegate<BookmarkId> selectionDelegate = mDelegate.getSelectionDelegate();
+        if (menuItem.getItemId() == R.id.selection_mode_edit_menu_id) {
             List<BookmarkId> list = selectionDelegate.getSelectedItems();
             assert list.size() == 1;
             BookmarkItem item = mDelegate.getModel().getBookmarkById(list.get(0));
@@ -131,10 +137,14 @@ public void onBookmarkDelegateInitialized(BookmarkDelegate delegate) {
         mDelegate.addUIObserver(this);
         if (!delegate.isDialogUi()) getMenu().removeItem(R.id.close_menu_id);
         delegate.getModel().addObserver(mBookmarkModelObserver);
+
+        getMenu().setGroupEnabled(R.id.selection_mode_menu_group, true);
     }
 
     @Override
     public void onDestroy() {
+        if (mDelegate == null) return;
+
         mDelegate.removeUIObserver(this);
         mDelegate.getModel().removeObserver(mBookmarkModelObserver);
     }