Commit 163257bb authored by rajendrant's avatar rajendrant Committed by Commit bot

Stop listening for CONNECTIVITY_ACTION in precache

Precache listens for CONNECTIVITY_ACTION in ChromeTabbedActivity to
update the precache shared preference, and to schedule/cancel GCM task
for precache.

This is redundant since the same happens via DeferredStartupHandler::
onDeferredStartup

BUG=585263

Review-Url: https://codereview.chromium.org/1923443002
Cr-Commit-Position: refs/heads/master@{#390300}
parent ddb327c1
...@@ -74,7 +74,6 @@ import org.chromium.chrome.browser.omnibox.AutocompleteController; ...@@ -74,7 +74,6 @@ import org.chromium.chrome.browser.omnibox.AutocompleteController;
import org.chromium.chrome.browser.partnercustomizations.HomepageManager; import org.chromium.chrome.browser.partnercustomizations.HomepageManager;
import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations; import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
import org.chromium.chrome.browser.preferences.ChromePreferenceManager; import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
import org.chromium.chrome.browser.preferences.ConnectionChangeReceiver;
import org.chromium.chrome.browser.preferences.PrefServiceBridge; import org.chromium.chrome.browser.preferences.PrefServiceBridge;
import org.chromium.chrome.browser.preferences.datareduction.DataReductionPromoScreen; import org.chromium.chrome.browser.preferences.datareduction.DataReductionPromoScreen;
import org.chromium.chrome.browser.signin.SigninPromoScreen; import org.chromium.chrome.browser.signin.SigninPromoScreen;
...@@ -187,8 +186,6 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode ...@@ -187,8 +186,6 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode
private TabModelSelectorTabObserver mTabModelSelectorTabObserver; private TabModelSelectorTabObserver mTabModelSelectorTabObserver;
private TabModelObserver mTabModelObserver; private TabModelObserver mTabModelObserver;
private ConnectionChangeReceiver mConnectionChangeReceiver;
private boolean mUIInitialized = false; private boolean mUIInitialized = false;
private boolean mIsOnFirstRun = false; private boolean mIsOnFirstRun = false;
...@@ -364,11 +361,6 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode ...@@ -364,11 +361,6 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode
if (getActivityTab() != null) getActivityTab().setIsAllowedToReturnToExternalApp(false); if (getActivityTab() != null) getActivityTab().setIsAllowedToReturnToExternalApp(false);
mTabModelSelectorImpl.saveState(); mTabModelSelectorImpl.saveState();
try {
getConnectionChangeReceiver().unregisterReceiver(ChromeTabbedActivity.this);
} catch (IllegalArgumentException e) {
// This may happen when onStop get called very early in UI test.
}
StartupMetrics.getInstance().recordHistogram(true); StartupMetrics.getInstance().recordHistogram(true);
mActivityStopMetrics.onStopWithNative(this); mActivityStopMetrics.onStopWithNative(this);
} }
...@@ -385,8 +377,6 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode ...@@ -385,8 +377,6 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode
// If we don't have a current tab, show the overview mode. // If we don't have a current tab, show the overview mode.
if (getActivityTab() == null) mLayoutManager.showOverview(false); if (getActivityTab() == null) mLayoutManager.showOverview(false);
getConnectionChangeReceiver().registerReceiver(ChromeTabbedActivity.this);
resetSavedInstanceState(); resetSavedInstanceState();
if (FeatureUtilities.isDocumentModeEligible(this)) { if (FeatureUtilities.isDocumentModeEligible(this)) {
...@@ -1354,13 +1344,6 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode ...@@ -1354,13 +1344,6 @@ public class ChromeTabbedActivity extends ChromeActivity implements OverviewMode
|| super.onKeyDown(keyCode, event); || super.onKeyDown(keyCode, event);
} }
private ConnectionChangeReceiver getConnectionChangeReceiver() {
if (mConnectionChangeReceiver == null) {
mConnectionChangeReceiver = new ConnectionChangeReceiver();
}
return mConnectionChangeReceiver;
}
@VisibleForTesting @VisibleForTesting
public View getTabsView() { public View getTabsView() {
return getCompositorViewHolder(); return getCompositorViewHolder();
......
// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package org.chromium.chrome.browser.preferences;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.net.ConnectivityManager;
import org.chromium.chrome.browser.precache.PrecacheLauncher;
/**
* When there is a change in the network connection,this will update the sharedpref value whether
* to allow prefetch or not.
*/
public class ConnectionChangeReceiver extends BroadcastReceiver {
private boolean mIsRegistered;
public void registerReceiver(Context context) {
mIsRegistered = true;
IntentFilter filter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION);
context.registerReceiver(this, filter);
}
public void unregisterReceiver(Context context) {
mIsRegistered = false;
context.unregisterReceiver(this);
}
@Override
public void onReceive(Context context, Intent intent) {
// Only handle the action if we're currently registered. If we're not registered as a
// listener, then we might be paused and native may not be loaded which would crash.
if (mIsRegistered) {
PrecacheLauncher.updatePrecachingEnabled(context.getApplicationContext());
}
}
}
...@@ -615,7 +615,6 @@ chrome_java_sources = [ ...@@ -615,7 +615,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java", "java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java",
"java/src/org/chromium/chrome/browser/preferences/ChromeSwitchPreference.java", "java/src/org/chromium/chrome/browser/preferences/ChromeSwitchPreference.java",
"java/src/org/chromium/chrome/browser/preferences/ClearBrowsingDataCheckBoxPreference.java", "java/src/org/chromium/chrome/browser/preferences/ClearBrowsingDataCheckBoxPreference.java",
"java/src/org/chromium/chrome/browser/preferences/ConnectionChangeReceiver.java",
"java/src/org/chromium/chrome/browser/preferences/DocumentModeManager.java", "java/src/org/chromium/chrome/browser/preferences/DocumentModeManager.java",
"java/src/org/chromium/chrome/browser/preferences/DocumentModePreference.java", "java/src/org/chromium/chrome/browser/preferences/DocumentModePreference.java",
"java/src/org/chromium/chrome/browser/preferences/ExpandablePreferenceGroup.java", "java/src/org/chromium/chrome/browser/preferences/ExpandablePreferenceGroup.java",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment