chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java - Issue 2754383004: Rename WebsiteSettings code to PageInfo.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

Issue 2754383004: Rename WebsiteSettings code to PageInfo. (Closed)

Patch Set: Upload missing comment fix for WebSettingsUI -> PageInfoUI. 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/omnibox/LocationBarLayout.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

index 6d370807b342e5115d8071c3afbf7a023ce2de60..e74b918ec26f243326dd5412c831b9627b10d4da 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

@@ -58,7 +58,7 @@ import org.chromium.chrome.browser.fullscreen.BrowserStateBrowserControlsVisibil

import org.chromium.chrome.browser.gsa.GSAState;

import org.chromium.chrome.browser.metrics.PageLoadMetrics;

import org.chromium.chrome.browser.net.spdyproxy.DataReductionProxySettings;

-import org.chromium.chrome.browser.page_info.WebsiteSettingsPopup;

+import org.chromium.chrome.browser.page_info.PageInfoPopup;

import org.chromium.chrome.browser.rappor.RapporServiceBridge;

import org.chromium.chrome.browser.tab.EmptyTabObserver;

import org.chromium.chrome.browser.tab.Tab;

@@ -902,10 +902,8 @@ public class CustomTabActivity extends ChromeActivity {

return true;

} else if (id == R.id.info_menu_id) {

if (getTabModelSelector().getCurrentTab() == null) return false;

- WebsiteSettingsPopup.show(

- this, getTabModelSelector().getCurrentTab(),

- getToolbarManager().getContentPublisher(),

- WebsiteSettingsPopup.OPENED_FROM_MENU);

+ PageInfoPopup.show(this, getTabModelSelector().getCurrentTab(),

+ getToolbarManager().getContentPublisher(), PageInfoPopup.OPENED_FROM_MENU);

return true;

}

return super.onMenuOrKeyboardAction(id, fromMenu);