Applying new dimensions for Classic Omnibox.

win32ss · Apr 2, 2024 · 05ed019 · 05ed019
1 parent 6d16c0e
commit 05ed019
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -204,7 +204,8 @@ LocationBarView::LocationBarView(Browser* browser,
     if (features::IsChromeRefresh2023()) {
       views::FocusRing::Get(this)->SetOutsetFocusRingDisabled(true);
     }
-    views::InstallPillHighlightPathGenerator(this);
+	if (!base::CommandLine::ForCurrentProcess()->HasSwitch("classic-omnibox"))
+		views::InstallPillHighlightPathGenerator(this);
 
 #if BUILDFLAG(IS_MAC)
     geolocation_permission_observation_.Observe(
@@ -435,6 +436,8 @@ bool LocationBarView::IsInitialized() const {
 }
 
 int LocationBarView::GetBorderRadius() const {
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch("classic-omnibox"))
+	  return 0;
   return ChromeLayoutProvider::Get()->GetCornerRadiusMetric(
       views::Emphasis::kMaximum, size());
 }
@@ -1155,13 +1158,13 @@ void LocationBarView::RefreshBackground() {
     border_color = color_provider->GetColor(kColorLocationBarBorderOnMismatch);
   }
 
-  if (is_popup_mode_) {
+    if (is_popup_mode_) {
     SetBackground(views::CreateSolidBackground(background_color));
-  } else {
+    } else {
     SetBackground(CreateRoundRectBackground(
         background_color, border_color, /*blend_mode=*/SkBlendMode::kSrcOver,
         /*antialias=*/true, /*should_border_scale=*/true));
-  }
+    }
 
   // Keep the views::Textfield in sync. It needs an opaque background to
   // correctly enable subpixel AA.

diff --git a/ui/views/layout/layout_provider.cc b/ui/views/layout/layout_provider.cc
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 
+#include "base/command_line.h"
 #include "base/containers/fixed_flat_map.h"
 #include "base/logging.h"
 #include "ui/base/ui_base_features.h"
@@ -205,6 +206,8 @@ ShapeSysTokens GetShapeSysToken(ShapeContextTokens id) {
 
 int LayoutProvider::GetCornerRadiusMetric(ShapeContextTokens id,
                                           const gfx::Size& size) const {
+  if (!base::CommandLine::ForCurrentProcess()->HasSwitch("classic-omnibox"))
+	  return 0;
   if (!features::IsChromeRefresh2023()) {
     switch (id) {
       case ShapeContextTokens::kBadgeRadius: