Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(988)

Side by Side Diff: chrome/android/java/src/org/chromium/chrome/browser/document/DocumentActivity.java

Issue 1849613002: Remove the Data Reduction Proxy SSL Android code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package org.chromium.chrome.browser.document; 5 package org.chromium.chrome.browser.document;
6 6
7 import android.annotation.TargetApi; 7 import android.annotation.TargetApi;
8 import android.content.Intent; 8 import android.content.Intent;
9 import android.graphics.Bitmap; 9 import android.graphics.Bitmap;
10 import android.graphics.Color; 10 import android.graphics.Color;
(...skipping 27 matching lines...) Expand all
38 import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; 38 import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior;
39 import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior.Overv iewModeObserver; 39 import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior.Overv iewModeObserver;
40 import org.chromium.chrome.browser.firstrun.FirstRunSignInProcessor; 40 import org.chromium.chrome.browser.firstrun.FirstRunSignInProcessor;
41 import org.chromium.chrome.browser.firstrun.FirstRunStatus; 41 import org.chromium.chrome.browser.firstrun.FirstRunStatus;
42 import org.chromium.chrome.browser.metrics.StartupMetrics; 42 import org.chromium.chrome.browser.metrics.StartupMetrics;
43 import org.chromium.chrome.browser.metrics.UmaUtils; 43 import org.chromium.chrome.browser.metrics.UmaUtils;
44 import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings; 44 import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
45 import org.chromium.chrome.browser.ntp.NewTabPage; 45 import org.chromium.chrome.browser.ntp.NewTabPage;
46 import org.chromium.chrome.browser.preferences.ChromePreferenceManager; 46 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
47 import org.chromium.chrome.browser.preferences.PrefServiceBridge; 47 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
48 import org.chromium.chrome.browser.preferences.datareduction.DataReductionPrefer ences;
49 import org.chromium.chrome.browser.preferences.datareduction.DataReductionPromoS creen; 48 import org.chromium.chrome.browser.preferences.datareduction.DataReductionPromoS creen;
50 import org.chromium.chrome.browser.signin.SigninPromoScreen; 49 import org.chromium.chrome.browser.signin.SigninPromoScreen;
51 import org.chromium.chrome.browser.tab.EmptyTabObserver; 50 import org.chromium.chrome.browser.tab.EmptyTabObserver;
52 import org.chromium.chrome.browser.tab.Tab; 51 import org.chromium.chrome.browser.tab.Tab;
53 import org.chromium.chrome.browser.tab.TabUma.TabCreationState; 52 import org.chromium.chrome.browser.tab.TabUma.TabCreationState;
54 import org.chromium.chrome.browser.tabmodel.AsyncTabParams; 53 import org.chromium.chrome.browser.tabmodel.AsyncTabParams;
55 import org.chromium.chrome.browser.tabmodel.AsyncTabParamsManager; 54 import org.chromium.chrome.browser.tabmodel.AsyncTabParamsManager;
56 import org.chromium.chrome.browser.tabmodel.SingleTabModelSelector; 55 import org.chromium.chrome.browser.tabmodel.SingleTabModelSelector;
57 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType; 56 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
58 import org.chromium.chrome.browser.tabmodel.document.ActivityDelegate; 57 import org.chromium.chrome.browser.tabmodel.document.ActivityDelegate;
(...skipping 670 matching lines...) Expand 10 before | Expand all | Expand 10 after
729 728
730 getToolbarManager().initializeWithNative(getTabModelSelector(), getFulls creenManager(), 729 getToolbarManager().initializeWithNative(getTabModelSelector(), getFulls creenManager(),
731 mFindToolbarManager, overviewModeBehavior, layoutDriver, tabSwit cherClickHandler, 730 mFindToolbarManager, overviewModeBehavior, layoutDriver, tabSwit cherClickHandler,
732 null, null, null); 731 null, null, null);
733 732
734 mTab.setFullscreenManager(getFullscreenManager()); 733 mTab.setFullscreenManager(getFullscreenManager());
735 734
736 mTab.addObserver(new DocumentTabObserver()); 735 mTab.addObserver(new DocumentTabObserver());
737 736
738 removeWindowBackground(); 737 removeWindowBackground();
739
740 if (mTab != null) {
741 DataReductionPreferences.launchDataReductionSSLInfoBar(
742 DocumentActivity.this, mTab.getWebContents());
743 }
744 } 738 }
745 739
746 private void resetIcon() { 740 private void resetIcon() {
747 mLargestFavicon = null; 741 mLargestFavicon = null;
748 updateTaskDescription(); 742 updateTaskDescription();
749 } 743 }
750 744
751 private void updateLastTabId() { 745 private void updateLastTabId() {
752 ChromeApplication.getDocumentTabModelSelector().selectModel(isIncognito( )); 746 ChromeApplication.getDocumentTabModelSelector().selectModel(isIncognito( ));
753 int tabId = mTab == null 747 int tabId = mTab == null
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
992 986
993 /** 987 /**
994 * Launch a new DocumentActivity showing the new tab page. 988 * Launch a new DocumentActivity showing the new tab page.
995 * @param incognito Whether the new NTP should be in incognito mode. 989 * @param incognito Whether the new NTP should be in incognito mode.
996 */ 990 */
997 private void launchNtp(boolean incognito) { 991 private void launchNtp(boolean incognito) {
998 if (incognito && !PrefServiceBridge.getInstance().isIncognitoModeEnabled ()) return; 992 if (incognito && !PrefServiceBridge.getInstance().isIncognitoModeEnabled ()) return;
999 getTabCreator(incognito).launchNTP(); 993 getTabCreator(incognito).launchNTP();
1000 } 994 }
1001 } 995 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698