PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disabling some omissions of complete urls: the old patch was modified (#1255)

Browse Source
This commit is contained in:
Carmelo Messina
2024-07-31 13:34:45 +02:00
parent b4d9e736d3
commit bb34519dcc
3 changed files with 126 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/cromite_patches_list.txt
+1 -1
View File
@@ -21,7 +21,7 @@ Always-use-new-tab-page-for-default-home-page.patch
disable-battery-status-updater.patch
Battery-API-return-nothing.patch
updater-disable-updater-pings.patch
Disable-omission-of-URL-elements-in-Omnibox.patch
Disable-omission-of-URL-elements.patch
Modify-default-preferences.patch
Do-not-store-passwords-by-default.patch
Disable-NTP-remote-suggestions-by-default.patch
build/patches/Disable-omission-of-URL-elements-in-Omnibox.patch
-48
View File
@@ -1,48 +0,0 @@
From: csagan5 <32685696+csagan5@users.noreply.github.com>
Date: Wed, 11 Oct 2017 23:24:58 +0200
Subject: Disable omission of URL elements in Omnibox
Disable all omissions because they are used throughout the code without
a corresponding user option to individually disable their usage.
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
.../toolbar/chrome_location_bar_model_delegate.cc | 2 +-
components/url_formatter/url_formatter.cc | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
--- a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
+++ b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
@@ -261,5 +261,5 @@ TemplateURLService* ChromeLocationBarModelDelegate::GetTemplateURLService() {
// static
void ChromeLocationBarModelDelegate::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
- registry->RegisterBooleanPref(omnibox::kPreventUrlElisionsInOmnibox, false);
+ registry->RegisterBooleanPref(omnibox::kPreventUrlElisionsInOmnibox, true);
}
diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc
--- a/components/url_formatter/url_formatter.cc
+++ b/components/url_formatter/url_formatter.cc
@@ -534,13 +534,13 @@ bool HasTwoViewSourceSchemes(std::string_view spec) {
} // namespace
const FormatUrlType kFormatUrlOmitNothing = 0;
-const FormatUrlType kFormatUrlOmitUsernamePassword = 1 << 0;
-const FormatUrlType kFormatUrlOmitHTTP = 1 << 1;
-const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 1 << 2;
-const FormatUrlType kFormatUrlOmitHTTPS = 1 << 3;
-const FormatUrlType kFormatUrlOmitTrivialSubdomains = 1 << 5;
-const FormatUrlType kFormatUrlTrimAfterHost = 1 << 6;
-const FormatUrlType kFormatUrlOmitFileScheme = 1 << 7;
+const FormatUrlType kFormatUrlOmitUsernamePassword = 0 << 0;
+const FormatUrlType kFormatUrlOmitHTTP = 0 << 1;
+const FormatUrlType kFormatUrlOmitTrailingSlashOnBareHostname = 0 << 2;
+const FormatUrlType kFormatUrlOmitHTTPS = 0 << 3;
+const FormatUrlType kFormatUrlOmitTrivialSubdomains = 0 << 5;
+const FormatUrlType kFormatUrlTrimAfterHost = 0 << 6;
+const FormatUrlType kFormatUrlOmitFileScheme = 0 << 7;
const FormatUrlType kFormatUrlOmitMailToScheme = 1 << 8;
const FormatUrlType kFormatUrlOmitMobilePrefix = 1 << 9;
--
build/patches/Disable-omission-of-URL-elements.patch
+125
View File
@@ -0,0 +1,125 @@
From: uazo <uazo@users.noreply.github.com>
Date: Wed, 11 Oct 2017 23:24:58 +0200
Subject: Disable omission of URL elements
Disabling some omissions of complete urls
License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
---
.../ephemeraltab/EphemeralTabSheetContent.java | 3 +--
.../share_sheet/ShareSheetBottomSheetContent.java | 4 +---
.../toolbar/chrome_location_bar_model_delegate.cc | 2 +-
.../ui/views/page_info/page_info_main_view.cc | 15 ++++++++++-----
.../components/bookmarks/BookmarkItem.java | 1 +
.../omnibox/browser/titled_url_match_utils.cc | 2 +-
.../components/page_info/PageInfoController.java | 3 +--
7 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabSheetContent.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabSheetContent.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabSheetContent.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabSheetContent.java
@@ -235,8 +235,7 @@ public class EphemeralTabSheetContent implements BottomSheetContent {
/** Sets the ephemeral tab URL. */
public void updateURL(GURL url) {
TextView originView = mToolbarView.findViewById(R.id.origin);
- originView.setText(
- UrlFormatter.formatUrlForSecurityDisplay(url, SchemeDisplay.OMIT_HTTP_AND_HTTPS));
+ originView.setText(url.getSpec());
}
/** Sets the security icon. */
diff --git a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetBottomSheetContent.java b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetBottomSheetContent.java
--- a/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetBottomSheetContent.java
+++ b/chrome/browser/share/android/java/src/org/chromium/chrome/browser/share/share_sheet/ShareSheetBottomSheetContent.java
@@ -268,9 +268,7 @@ class ShareSheetBottomSheetContent implements BottomSheetContent, OnItemClickLis
ShareSheetLinkToggleCoordinator shareSheetLinkToggleCoordinator) {
// Default preview is to show title + url.
String title = mParams.getTitle();
- String subtitle =
- UrlFormatter.formatUrlForSecurityDisplay(
- mParams.getUrl(), SchemeDisplay.OMIT_HTTP_AND_HTTPS);
+ String subtitle = mParams.getUrl();
if (contentTypes.contains(ContentType.IMAGE)
|| contentTypes.contains(ContentType.IMAGE_AND_LINK)) {
diff --git a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
--- a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
+++ b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.cc
@@ -261,5 +261,5 @@ TemplateURLService* ChromeLocationBarModelDelegate::GetTemplateURLService() {
// static
void ChromeLocationBarModelDelegate::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable* registry) {
- registry->RegisterBooleanPref(omnibox::kPreventUrlElisionsInOmnibox, false);
+ registry->RegisterBooleanPref(omnibox::kPreventUrlElisionsInOmnibox, true);
}
diff --git a/chrome/browser/ui/views/page_info/page_info_main_view.cc b/chrome/browser/ui/views/page_info/page_info_main_view.cc
--- a/chrome/browser/ui/views/page_info/page_info_main_view.cc
+++ b/chrome/browser/ui/views/page_info/page_info_main_view.cc
@@ -562,10 +562,14 @@ void PageInfoMainView::ChildPreferredSizeChanged(views::View* child) {
}
std::unique_ptr<views::View> PageInfoMainView::CreateBubbleHeaderView() {
- auto header = std::make_unique<views::View>();
- header->SetLayoutManager(std::make_unique<views::FlexLayout>())
+ auto cromite_header = std::make_unique<views::ScrollView>();
+ cromite_header->SetVerticalScrollBarMode(views::ScrollView::ScrollBarMode::kHiddenButEnabled);
+ cromite_header->SetHorizontalScrollBarMode(views::ScrollView::ScrollBarMode::kDisabled);
+ cromite_header->ClipHeightTo(0, 150);
+ auto scroll_contents = std::make_unique<views::View>();
+ scroll_contents->SetLayoutManager(std::make_unique<views::FlexLayout>())
->SetInteriorMargin(gfx::Insets::VH(0, 20));
- title_ = header->AddChildView(std::make_unique<views::Label>(
+ title_ = scroll_contents->AddChildView(std::make_unique<views::Label>(
std::u16string(), views::style::CONTEXT_DIALOG_TITLE,
views::style::STYLE_HEADLINE_4,
gfx::DirectionalityMode::DIRECTIONALITY_AS_URL));
@@ -589,9 +593,10 @@ std::unique_ptr<views::View> PageInfoMainView::CreateBubbleHeaderView() {
// button padding when calculating margins.
close_button->SetProperty(views::kInternalPaddingKey,
close_button->GetInsets());
- header->AddChildView(close_button.release());
+ scroll_contents->AddChildView(close_button.release());
+ cromite_header->SetContents(std::move(scroll_contents));
- return header;
+ return cromite_header;
}
std::unique_ptr<views::View> PageInfoMainView::CreateAboutThisSiteSection(
diff --git a/components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkItem.java b/components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkItem.java
--- a/components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkItem.java
+++ b/components/bookmarks/common/android/java/src/org/chromium/components/bookmarks/BookmarkItem.java
@@ -61,6 +61,7 @@ public class BookmarkItem {
/** Returns the string to display for the item's url. */
public String getUrlForDisplay() {
+ if ((true)) return getUrl().getSpec();
return UrlFormatter.formatUrlForSecurityDisplay(
getUrl(), SchemeDisplay.OMIT_HTTP_AND_HTTPS);
}
diff --git a/components/omnibox/browser/titled_url_match_utils.cc b/components/omnibox/browser/titled_url_match_utils.cc
--- a/components/omnibox/browser/titled_url_match_utils.cc
+++ b/components/omnibox/browser/titled_url_match_utils.cc
@@ -81,7 +81,7 @@ AutocompleteMatch TitledUrlMatchToAutocompleteMatch(
// Otherwise, display the path, even if the input matches both or neither.
bool show_path = titled_url_match.has_ancestor_match ||
titled_url_match.url_match_positions.empty();
- match.contents = show_path ? path : formatted_url;
+ match.contents = /*show_path ? path :*/ formatted_url;
// The path can become stale (when the bookmark is moved). So persist the URL
// instead when creating shortcuts.
if (show_path)
diff --git a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java
--- a/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java
+++ b/components/page_info/android/java/src/org/chromium/components/page_info/PageInfoController.java
@@ -226,8 +226,7 @@ public class PageInfoController
OmniboxUrlEmphasizer.getOriginEndIndex(
displayUrlBuilder.toString(), autocompleteSchemeClassifier);
autocompleteSchemeClassifier.destroy();
- containerParams.truncatedUrl =
- UrlFormatter.formatUrlForDisplayOmitSchemePathAndTrivialSubdomains(mFullUrl);
+ containerParams.truncatedUrl = url;
containerParams.backButtonClickCallback = this::exitSubpage;
containerParams.urlTitleClickCallback = mContainer::toggleUrlTruncation;
// Long press the url text to copy it to the clipboard.
--