chromium/src
0
Fork 0
Code Activity

Revert "[GlicButton] Use flex layouts instead of box layouts"

Browse Source 
This reverts commit ec1e1c2afc.

Reason for revert: Flex layout shows close button

Original change's description:
> [GlicButton] Use flex layouts instead of box layouts
>
> Bug: b:408260635
> Change-Id: Ibef55e00fe2ddaad944ead85a2ed40d2f3e78de8
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6427169
> Reviewed-by: Dana Fried <dfried@chromium.org>
> Commit-Queue: Jeffrey Cohen <jeffreycohen@google.com>
> Cr-Commit-Position: refs/heads/main@{#1442421}

Bug: b:408260635
Change-Id: I36a443c4649c366819fa2be9f08c0eab03d4c6f1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6438376
Reviewed-by: Eshwar Stalin <estalin@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Jeffrey Cohen <jeffreycohen@google.com>
Cr-Commit-Position: refs/heads/main@{#1443590}
This commit is contained in:
Jeffrey Cohen
2025-04-07 10:26:25 -07:00
committed by Chromium LUCI CQ
parent 0dcac7c79a
commit b002fce7d7
3 changed files with 14 additions and 10 deletions

7
chrome/browser/ui/views/tabs/glic_button.cc

@@ -28,7 +28,7 @@
#include "ui/views/controls/menu/menu_item_view.h"
#include "ui/views/controls/menu/menu_model_adapter.h"
#include "ui/views/controls/menu/menu_runner.h"
#include "ui/views/layout/flex_layout.h"
#include "ui/views/layout/box_layout.h"
#include "ui/views/view_class_properties.h"
namespace glic {
@@ -70,8 +70,9 @@ GlicButton::GlicButton(TabStripController* tab_strip_controller,
SetFocusBehavior(FocusBehavior::ALWAYS);
auto* const layout_manager =
SetLayoutManager(std::make_unique<views::FlexLayout>());
layout_manager->SetMainAxisAlignment(views::LayoutAlignment::kStart);
SetLayoutManager(std::make_unique<views::BoxLayout>());
layout_manager->set_main_axis_alignment(
views::BoxLayout::MainAxisAlignment::kStart);
}
GlicButton::~GlicButton() = default;

10
chrome/browser/ui/views/tabs/tab_strip_action_container.cc

@@ -33,7 +33,7 @@
#include "ui/base/metadata/metadata_impl_macros.h"
#include "ui/gfx/animation/tween.h"
#include "ui/views/accessibility/view_accessibility.h"
#include "ui/views/layout/flex_layout.h"
#include "ui/views/layout/box_layout.h"
#include "ui/views/mouse_watcher.h"
#include "ui/views/mouse_watcher_view_host.h"
#include "ui/views/view_class_properties.h"
@@ -278,9 +278,11 @@ TabStripActionContainer::TabStripActionContainer(
}
#endif // BUILDFLAG(ENABLE_GLIC)
auto* const layout_manager =
SetLayoutManager(std::make_unique<views::FlexLayout>());
layout_manager->SetMainAxisAlignment(views::LayoutAlignment::kStart);
layout_manager->SetCrossAxisAlignment(views::LayoutAlignment::kCenter);
SetLayoutManager(std::make_unique<views::BoxLayout>());
layout_manager->set_main_axis_alignment(
views::BoxLayout::MainAxisAlignment::kStart);
layout_manager->set_cross_axis_alignment(
views::BoxLayout::CrossAxisAlignment::kCenter);
}
TabStripActionContainer::~TabStripActionContainer() {

7
chrome/browser/ui/views/tabs/tab_strip_nudge_button.cc

@@ -18,7 +18,7 @@
#include "ui/views/accessibility/view_accessibility.h"
#include "ui/views/animation/ink_drop.h"
#include "ui/views/controls/highlight_path_generator.h"
#include "ui/views/layout/flex_layout.h"
#include "ui/views/layout/box_layout.h"
#include "ui/views/view_class_properties.h"
namespace {
@@ -45,8 +45,9 @@ TabStripNudgeButton::TabStripNudgeButton(
Edge::kNone,
flat_edge) {
auto* const layout_manager =
SetLayoutManager(std::make_unique<views::FlexLayout>());
layout_manager->SetMainAxisAlignment(views::LayoutAlignment::kEnd);
SetLayoutManager(std::make_unique<views::BoxLayout>());
layout_manager->set_main_axis_alignment(
views::BoxLayout::MainAxisAlignment::kEnd);
SetProperty(views::kElementIdentifierKey, element_identifier);