[NextBrowser] Uncommenting launch issue code from toolbar_view.cc

Change-Id: I1b748160f642f9b72299e52717df7eb07dfdeb68
Signed-off-by: Abhishek Arora <abhik.arora@samsung.com>

diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc
index 80544910d8a2fae03db35fbef5b800baa6acd866..d2785c405ebd34d41c42bfb748d39ece263b9068 100644 (file)
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -1314,8 +1314,10 @@ void ToolbarView::InitLayout() {
         views::kMarginsKey,
         gfx::Insets::VH(0, GetLayoutConstant(TOOLBAR_DIVIDER_SPACING)));
   }
-//[NexBrowser] below code temporarily commented to fix launch issue.
-  if (/*base::FeatureList::IsEnabled(features::kResponsiveToolbar)*/false) {
+// Adding build flag here as pinned_toolbar_actions_container_ is not defined
+// for NextBrowser
+#if !defined(SAMSUNG_TOOLBAR_UI)
+  if (base::FeatureList::IsEnabled(features::kResponsiveToolbar)) {
     constexpr int kToolbarFlexOrderStart = 1;
 
     // TODO(crbug.com/40929989): Ignore containers till issue addressed.
@@ -1325,7 +1327,7 @@ void ToolbarView::InitLayout() {
         container_view_, overflow_button_, pinned_toolbar_actions_container_);
     overflow_button_->set_toolbar_controller(toolbar_controller_.get());
   }
-
+#endif
   LayoutCommon();
 }