Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit aabb7ddc authored by Carmelo Messina's avatar Carmelo Messina
Browse files

Content settings infrastructure: fix the crash on the desktop when switching... 

Content settings infrastructure: fix the crash on the desktop when switching between subpages in view site information.
parent e17891af

build/patches/Content-settings-infrastructure.patch

+14 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ Require: bromite-build-utils.patch 
 .../site_settings_page/site_settings_page.ts  |  30 +-

 chrome/browser/ui/BUILD.gn                    |   2 +

 .../controls/rich_controls_container_view.h   |   7 +

 .../views/page_info/page_info_bubble_view.cc  |   2 +-

 .../ui/views/page_info/page_info_main_view.cc |  28 +-

 .../views/page_info/page_info_view_factory.cc |  20 +

 .../views/page_info/page_info_view_factory.h  |   5 +
@@ -85,7 +86,7 @@ Require: bromite-build-utils.patch 
 .../platform/web_content_settings_client.h    |  13 +

 .../execution_context/execution_context.cc    |  16 +

 .../execution_context/execution_context.h     |   5 +

 74 files changed, 1962 insertions(+), 107 deletions(-)

 75 files changed, 1963 insertions(+), 108 deletions(-)

 create mode 100644 components/browser_ui/settings/android/java/res/layout/preference_spinner_single_widget.xml

 create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSetting.java

 create mode 100644 components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/BromiteCustomContentSettingImpl.java
@@ -766,6 +767,18 @@ diff --git a/chrome/browser/ui/views/controls/rich_controls_container_view.h b/c 
   int GetFirstLineHeight();

   gfx::Size FlexRule(const views::View* view,

                      const views::SizeBounds& maximum_size) const;

diff --git a/chrome/browser/ui/views/page_info/page_info_bubble_view.cc b/chrome/browser/ui/views/page_info/page_info_bubble_view.cc

--- a/chrome/browser/ui/views/page_info/page_info_bubble_view.cc

+++ b/chrome/browser/ui/views/page_info/page_info_bubble_view.cc

@@ -256,7 +256,7 @@ void PageInfoBubbleView::OpenMainPage(base::OnceClosure initialized_callback) {

 

   auto* close_button = page_container_->GetViewByID(

       PageInfoViewFactory::VIEW_ID_PAGE_INFO_CLOSE_BUTTON);

-  close_button->RequestFocus();

+  if (close_button) close_button->RequestFocus();

 }

 

 void PageInfoBubbleView::OpenSecurityPage() {

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