Update to 63.0.3239.40

Author: kuoruan

Chromium/args.gn

@@ -10,4 +10,3 @@ enable_nacl = false
 remove_webcore_debug_symbols = true
 proprietary_codecs = true
 ffmpeg_branding = "Chrome"
-exclude_unwind_tables = true

app/build.gradle

@@ -60,7 +60,7 @@ idea {
 }
 
 dependencies {
-    implementation fileTree(include: ['*.jar'], dir: 'libs')
+     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation "com.android.support:appcompat-v7:$rootProject.ext.supportLibraryVersion"
     implementation "com.android.support:design:$rootProject.ext.supportLibraryVersion"
     implementation "com.android.support:gridlayout-v7:$rootProject.ext.supportLibraryVersion"

app/libs/gcm.jar

@@ -602,8 +602,9 @@ by a child template that "extends" this file.
                 <category android:name="com.google.intent.category.CARDBOARD" />
             </intent-filter>
         </activity>
+        <!-- TODO(crbug.com/780674): retarget .Main back to CTA for non-modern APK -->
         <activity-alias android:name="com.google.android.apps.chrome.Main"
-            android:targetActivity="org.chromium.chrome.browser.ChromeTabbedActivity"
+            android:targetActivity="org.chromium.chrome.browser.document.ChromeLauncherActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -669,19 +670,30 @@ by a child template that "extends" this file.
         </activity>
         <activity android:name="org.chromium.chrome.browser.firstrun.LightweightFirstRunActivity"
             android:theme="@style/SimpleDialog"
-            android:launchMode="singleInstance"
+                        android:launchMode="singleInstance"
+            android:excludeFromRecents="true"
             android:autoRemoveFromRecents="true"
             android:windowSoftInputMode="stateHidden|adjustPan"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize">
+>
         </activity>
         <activity android:name="org.chromium.chrome.browser.firstrun.FirstRunActivity"
-            android:theme="@style/DialogWhenLarge"
+            android:theme="@style/FirstRunTheme"
             android:launchMode="singleInstance"
             android:excludeFromRecents="true"
             android:autoRemoveFromRecents="true"
             android:windowSoftInputMode="stateHidden|adjustPan"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize">
         </activity>
+        <activity android:name="org.chromium.chrome.browser.firstrun.TabbedModeFirstRunActivity"
+            android:theme="@style/TabbedModeFirstRunTheme"
+                        android:launchMode="singleInstance"
+            android:excludeFromRecents="true"
+            android:autoRemoveFromRecents="true"
+            android:windowSoftInputMode="stateHidden|adjustPan"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize">
+>
+        </activity>
         <activity android:name="org.chromium.chrome.browser.vr_shell.VrFirstRunActivity"
             android:exported="false"
             android:launchMode="singleInstance"

app/src/main/AndroidManifest.xml

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

app/src/main/assets/resources.pak

@@ -237,7 +237,7 @@ public AppMenuHandler get(Activity activity, AppMenuPropertiesDelegate delegate,
     private boolean mDeferredStartupPosted;
 
     private boolean mTabModelsInitialized;
-    private boolean mNativeInitialized;
+    protected boolean mNativeInitialized;
     private boolean mRemoveWindowBackgroundDone;
 
     // The class cannot implement TouchExplorationStateChangeListener,

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

@@ -2265,7 +2265,7 @@ protected void setStatusBarColor(Tab tab, int color) {
     @Override
     public void onMultiWindowModeChanged(boolean isInMultiWindowMode) {
         super.onMultiWindowModeChanged(isInMultiWindowMode);
-        if (!FeatureUtilities.isTabModelMergingEnabled()) return;
+        if (!FeatureUtilities.isTabModelMergingEnabled() || !mNativeInitialized) return;
         if (!isInMultiWindowMode) {
             // If the activity is currently resumed when multi-window mode is exited, try to merge
             // tabs from the other activity instance.

app/src/main/java/org/chromium/chrome/browser/ChromeActivity.java

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

app/src/main/java/org/chromium/chrome/browser/ChromeTabbedActivity.java

@@ -28,6 +28,7 @@
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.blink_public.web.WebReferrerPolicy;
 import org.chromium.chrome.browser.browserservices.BrowserSessionContentUtils;
+import org.chromium.chrome.browser.document.ChromeLauncherActivity;
 import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationDelegateImpl;
 import org.chromium.chrome.browser.externalnav.IntentWithGesturesHandler;
@@ -236,15 +237,6 @@ private static ComponentName getFakeComponentName(String packageName) {
     public static final String GOOGLECHROME_NAVIGATE_PREFIX =
             GOOGLECHROME_SCHEME + "://navigate?url=";
 
-    /**
-     * The class name to be specified in the ComponentName for Intents that are creating a new
-     * tab (regardless of whether the user is in document or tabbed mode).
-     */
-    // TODO(tedchoc): Remove this and directly reference the Launcher activity when that becomes
-    //                publicly available.
-    private static final String TAB_ACTIVITY_COMPONENT_CLASS_NAME =
-            "com.google.android.apps.chrome.Main";
-
     private static boolean sTestIntentsEnabled;
 
     private final IntentHandlerDelegate mDelegate;
@@ -610,7 +602,7 @@ public static void startActivityForTrustedIntent(Intent intent) {
     public static void startChromeLauncherActivityForTrustedIntent(Intent intent) {
         // Specify the exact component that will handle creating a new tab.  This allows specifying
         // URLs that are not exposed in the intent filters (i.e. chrome://).
-        startActivityForTrustedIntentInternal(intent, TAB_ACTIVITY_COMPONENT_CLASS_NAME);
+        startActivityForTrustedIntentInternal(intent, ChromeLauncherActivity.class.getName());
     }
 
     private static void startActivityForTrustedIntentInternal(