Add-menu-item-to-view-source.patch 6.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126
  1. From: csagan5 <32685696+csagan5@users.noreply.github.com>
  2. Date: Mon, 13 Jul 2020 00:37:06 +0200
  3. Subject: Add menu item to view source
  4. ---
  5. chrome/android/java/res/menu/custom_tabs_menu.xml | 3 +++
  6. chrome/android/java/res/menu/main_menu.xml | 3 +++
  7. .../chrome/browser/ChromeTabbedActivity.java | 2 ++
  8. .../chrome/browser/app/ChromeActivity.java | 5 +++++
  9. .../app/appmenu/AppMenuPropertiesDelegateImpl.java | 14 ++++++++++++++
  10. .../CustomTabAppMenuPropertiesDelegate.java | 1 +
  11. .../ui/android/strings/android_chrome_strings.grd | 4 ++++
  12. 7 files changed, 32 insertions(+)
  13. diff --git a/chrome/android/java/res/menu/custom_tabs_menu.xml b/chrome/android/java/res/menu/custom_tabs_menu.xml
  14. --- a/chrome/android/java/res/menu/custom_tabs_menu.xml
  15. +++ b/chrome/android/java/res/menu/custom_tabs_menu.xml
  16. @@ -46,6 +46,9 @@
  17. <item android:id="@+id/add_to_homescreen_id"
  18. android:title="@string/menu_add_to_homescreen"
  19. android:orderInCategory="2" />
  20. + <item android:id="@+id/view_source_id"
  21. + android:title="@string/view_source"
  22. + android:orderInCategory="2" />
  23. <item android:id="@+id/open_webapk_id"
  24. android:title="@string/menu_open_webapk"
  25. android:orderInCategory="2" />
  26. diff --git a/chrome/android/java/res/menu/main_menu.xml b/chrome/android/java/res/menu/main_menu.xml
  27. --- a/chrome/android/java/res/menu/main_menu.xml
  28. +++ b/chrome/android/java/res/menu/main_menu.xml
  29. @@ -103,6 +103,9 @@
  30. <item android:id="@+id/add_to_homescreen_id"
  31. android:title="@string/menu_add_to_homescreen"
  32. android:icon="@drawable/ic_add_to_home_screen" />
  33. + <item android:id="@+id/view_source_id"
  34. + android:title="@string/view_source"
  35. + android:icon="@drawable/ic_drive_document_24dp" />
  36. <item android:id="@+id/open_webapk_id"
  37. android:title="@string/menu_open_webapk"
  38. android:icon="@drawable/ic_add_to_home_screen" />
  39. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
  40. --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
  41. +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
  42. @@ -2067,6 +2067,8 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
  43. NewTabPageUma.recordAction(NewTabPageUma.ACTION_OPENED_DOWNLOADS_MANAGER);
  44. }
  45. RecordUserAction.record("MobileMenuDownloadManager");
  46. + } else if (id == R.id.view_source_id) {
  47. + currentTab.getWebContents().getNavigationController().loadUrl(new LoadUrlParams("view-source:"+currentTab.getUrl().getSpec()));
  48. } else if (id == R.id.open_recently_closed_tab) {
  49. TabModel currentModel = mTabModelSelector.getCurrentModel();
  50. if (!currentModel.isIncognito()) currentModel.openMostRecentlyClosedTab();
  51. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
  52. --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
  53. +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
  54. @@ -2451,6 +2451,11 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
  55. return true;
  56. }
  57. + if (id == R.id.view_source_id) {
  58. + currentTab.getWebContents().getNavigationController().loadUrl(new LoadUrlParams("view-source:"+currentTab.getUrl().getSpec()));
  59. + return true;
  60. + }
  61. +
  62. if (id == R.id.request_desktop_site_id || id == R.id.request_desktop_site_check_id) {
  63. boolean usingDesktopUserAgent =
  64. currentTab.getWebContents().getNavigationController().getUseDesktopUserAgent();
  65. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
  66. --- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
  67. +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
  68. @@ -511,6 +511,7 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
  69. isChromeScheme, isFileScheme, isContentScheme, isIncognito, url));
  70. updateRequestDesktopSiteMenuItem(menu, currentTab, true /* can show */, isChromeScheme);
  71. + updateViewSourceMenuItem(menu, currentTab);
  72. updateAutoDarkMenuItem(menu, currentTab, isChromeScheme);
  73. @@ -1027,6 +1028,19 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
  74. }
  75. }
  76. + /**
  77. + * Updates the view source menu item's state.
  78. + *
  79. + * @param menu {@link Menu} for view source.
  80. + * @param currentTab Current tab being displayed.
  81. + */
  82. + protected void updateViewSourceMenuItem(
  83. + Menu menu, Tab currentTab) {
  84. + MenuItem viewSourceMenuItem = menu.findItem(R.id.view_source_id);
  85. + String url = currentTab.getUrl().getSpec();
  86. + viewSourceMenuItem.setVisible(!url.isEmpty() && !url.startsWith("view-source:"));
  87. + }
  88. +
  89. /**
  90. * Updates the request desktop site item's state.
  91. *
  92. diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
  93. --- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
  94. +++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java
  95. @@ -217,6 +217,7 @@ public class CustomTabAppMenuPropertiesDelegate extends AppMenuPropertiesDelegat
  96. updateRequestDesktopSiteMenuItem(
  97. menu, currentTab, requestDesktopSiteVisible, isChromeScheme);
  98. + updateViewSourceMenuItem(menu, currentTab);
  99. prepareAddToHomescreenMenuItem(menu, currentTab, addToHomeScreenVisible);
  100. }
  101. }
  102. diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
  103. --- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
  104. +++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
  105. @@ -299,6 +299,10 @@ CHAR_LIMIT guidelines:
  106. Sign-in verifications
  107. </message>
  108. + <message name="IDS_VIEW_SOURCE" desc="Title for the menu command to view the source of the current page. [CHAR-LIMIT=40]">
  109. + View source
  110. + </message>
  111. +
  112. <message name="IDS_UNSUPPORTED" desc="Message displayed to the user when an attempted action is not supported.">
  113. Unsupported
  114. </message>
  115. --
  116. 2.20.1