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

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

Issue 2754383004: Rename WebsiteSettings code to PageInfo. (Closed)
Patch Set: Address msw@'s comments. Created 3 years, 9 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; 5 package org.chromium.chrome.browser;
6 6
7 import android.annotation.SuppressLint; 7 import android.annotation.SuppressLint;
8 import android.annotation.TargetApi; 8 import android.annotation.TargetApi;
9 import android.app.Activity; 9 import android.app.Activity;
10 import android.app.SearchManager; 10 import android.app.SearchManager;
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 import org.chromium.chrome.browser.metrics.WebApkUma; 93 import org.chromium.chrome.browser.metrics.WebApkUma;
94 import org.chromium.chrome.browser.multiwindow.MultiWindowUtils; 94 import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
95 import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings; 95 import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;
96 import org.chromium.chrome.browser.nfc.BeamController; 96 import org.chromium.chrome.browser.nfc.BeamController;
97 import org.chromium.chrome.browser.nfc.BeamProvider; 97 import org.chromium.chrome.browser.nfc.BeamProvider;
98 import org.chromium.chrome.browser.ntp.NewTabPage; 98 import org.chromium.chrome.browser.ntp.NewTabPage;
99 import org.chromium.chrome.browser.ntp.NewTabPageUma; 99 import org.chromium.chrome.browser.ntp.NewTabPageUma;
100 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge; 100 import org.chromium.chrome.browser.offlinepages.OfflinePageBridge;
101 import org.chromium.chrome.browser.offlinepages.OfflinePageUtils; 101 import org.chromium.chrome.browser.offlinepages.OfflinePageUtils;
102 import org.chromium.chrome.browser.omaha.UpdateMenuItemHelper; 102 import org.chromium.chrome.browser.omaha.UpdateMenuItemHelper;
103 import org.chromium.chrome.browser.page_info.WebsiteSettingsPopup; 103 import org.chromium.chrome.browser.page_info.PageInfoPopup;
104 import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomiza tions; 104 import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomiza tions;
105 import org.chromium.chrome.browser.physicalweb.PhysicalWebShareActivity; 105 import org.chromium.chrome.browser.physicalweb.PhysicalWebShareActivity;
106 import org.chromium.chrome.browser.preferences.ChromePreferenceManager; 106 import org.chromium.chrome.browser.preferences.ChromePreferenceManager;
107 import org.chromium.chrome.browser.preferences.PrefServiceBridge; 107 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
108 import org.chromium.chrome.browser.preferences.PreferencesLauncher; 108 import org.chromium.chrome.browser.preferences.PreferencesLauncher;
109 import org.chromium.chrome.browser.printing.PrintShareActivity; 109 import org.chromium.chrome.browser.printing.PrintShareActivity;
110 import org.chromium.chrome.browser.printing.TabPrinter; 110 import org.chromium.chrome.browser.printing.TabPrinter;
111 import org.chromium.chrome.browser.share.OptionalShareTargetsManager; 111 import org.chromium.chrome.browser.share.OptionalShareTargetsManager;
112 import org.chromium.chrome.browser.share.ShareActivity; 112 import org.chromium.chrome.browser.share.ShareActivity;
113 import org.chromium.chrome.browser.share.ShareHelper; 113 import org.chromium.chrome.browser.share.ShareHelper;
(...skipping 1709 matching lines...) Expand 10 before | Expand all | Expand 10 after
1823 RecordUserAction.record("MobileMenuDownloadPage"); 1823 RecordUserAction.record("MobileMenuDownloadPage");
1824 } else if (id == R.id.reload_menu_id) { 1824 } else if (id == R.id.reload_menu_id) {
1825 if (currentTab.isLoading()) { 1825 if (currentTab.isLoading()) {
1826 currentTab.stopLoading(); 1826 currentTab.stopLoading();
1827 RecordUserAction.record("MobileMenuStop"); 1827 RecordUserAction.record("MobileMenuStop");
1828 } else { 1828 } else {
1829 currentTab.reload(); 1829 currentTab.reload();
1830 RecordUserAction.record("MobileMenuReload"); 1830 RecordUserAction.record("MobileMenuReload");
1831 } 1831 }
1832 } else if (id == R.id.info_menu_id) { 1832 } else if (id == R.id.info_menu_id) {
1833 WebsiteSettingsPopup.show( 1833 PageInfoPopup.show(this, currentTab, null, PageInfoPopup.OPENED_FROM _MENU);
1834 this, currentTab, null, WebsiteSettingsPopup.OPENED_FROM_MEN U);
1835 } else if (id == R.id.open_history_menu_id) { 1834 } else if (id == R.id.open_history_menu_id) {
1836 if (NewTabPage.isNTPUrl(currentTab.getUrl())) { 1835 if (NewTabPage.isNTPUrl(currentTab.getUrl())) {
1837 NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_HISTORY_M ANAGER); 1836 NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_HISTORY_M ANAGER);
1838 } 1837 }
1839 RecordUserAction.record("MobileMenuHistory"); 1838 RecordUserAction.record("MobileMenuHistory");
1840 HistoryManagerUtils.showHistoryManager(this, currentTab); 1839 HistoryManagerUtils.showHistoryManager(this, currentTab);
1841 StartupMetrics.getInstance().recordOpenedHistory(); 1840 StartupMetrics.getInstance().recordOpenedHistory();
1842 } else if (id == R.id.share_menu_id || id == R.id.direct_share_menu_id) { 1841 } else if (id == R.id.share_menu_id || id == R.id.direct_share_menu_id) {
1843 onShareMenuItemSelected(id == R.id.direct_share_menu_id, 1842 onShareMenuItemSelected(id == R.id.direct_share_menu_id,
1844 getCurrentTabModel().isIncognito()); 1843 getCurrentTabModel().isIncognito());
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
2130 * draw over VR contents should be hidden in this call. 2129 * draw over VR contents should be hidden in this call.
2131 */ 2130 */
2132 public void onEnterVR() {} 2131 public void onEnterVR() {}
2133 2132
2134 /** 2133 /**
2135 * Called when VR mode using this activity is exited. Any state set for VR s hould be restored 2134 * Called when VR mode using this activity is exited. Any state set for VR s hould be restored
2136 * in this call, including showing 2D UI that was hidden. 2135 * in this call, including showing 2D UI that was hidden.
2137 */ 2136 */
2138 public void onExitVR() {} 2137 public void onExitVR() {}
2139 } 2138 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698