You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
chromium/chromium-122-unique_ptr.patch

45 lines
2.2 KiB

commit 5517d167c083885847a08a83b96da03b1eb2bc3e
Author: Jose Dapena Paz <jdapena@igalia.com>
Date: Tue Jan 23 15:34:35 2024 +0000
libstdc++: do not require including unique_ptr in header
Including std::unique_ptr declaration initial value requires
declaration of contained type.
Bug: 957519
Change-Id: If9b0362b6cea48a395041faa82f83b6f48b98403
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5225137
Reviewed-by: Caroline Rising <corising@chromium.org>
Commit-Queue: José Dapena Paz <jdapena@igalia.com>
Cr-Commit-Position: refs/heads/main@{#1250826}
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.h b/chrome/browser/ui/views/toolbar/toolbar_view.h
index ec3e34a86f4c5..32ca27b6d126b 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view.h
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.h
@@ -311,8 +311,7 @@ class ToolbarView : public views::AccessiblePaneView,
AppMenuIconController app_menu_icon_controller_;
std::unique_ptr<ChromeLabsModel> chrome_labs_model_;
- std::unique_ptr<ExtensionsToolbarCoordinator>
- extensions_toolbar_coordinator_ = nullptr;
+ std::unique_ptr<ExtensionsToolbarCoordinator> extensions_toolbar_coordinator_;
// Controls whether or not a home button should be shown on the toolbar.
BooleanPrefMember show_home_button_;
diff --git a/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_toolbar_button_container.h b/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_toolbar_button_container.h
index 3046c543c7c8e..46ff5d40ffad3 100644
--- a/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_toolbar_button_container.h
+++ b/chrome/browser/ui/views/web_apps/frame_toolbar/web_app_toolbar_button_container.h
@@ -150,8 +150,7 @@ class WebAppToolbarButtonContainer : public views::View,
std::unique_ptr<PageActionIconController> page_action_icon_controller_;
int page_action_insertion_point_ = 0;
- std::unique_ptr<ExtensionsToolbarCoordinator>
- extensions_toolbar_coordinator_ = nullptr;
+ std::unique_ptr<ExtensionsToolbarCoordinator> extensions_toolbar_coordinator_;
// All remaining members are owned by the views hierarchy.
raw_ptr<WebAppOriginText> web_app_origin_text_ = nullptr;