Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(309)

Unified Diff: chrome/browser/ui/cocoa/location_bar/security_state_bubble_decoration.mm

Issue 2375033002: cocoa browser: remove non-MD location bar support (Closed)
Patch Set: fix nits Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/location_bar/security_state_bubble_decoration.mm
diff --git a/chrome/browser/ui/cocoa/location_bar/security_state_bubble_decoration.mm b/chrome/browser/ui/cocoa/location_bar/security_state_bubble_decoration.mm
index 5cf77aae6fe8e4a9f30dc5a23bd3dde8cebd55a0..6a5f597d93f95d3b18b216849c78c280b97d22ab 100644
--- a/chrome/browser/ui/cocoa/location_bar/security_state_bubble_decoration.mm
+++ b/chrome/browser/ui/cocoa/location_bar/security_state_bubble_decoration.mm
@@ -50,10 +50,6 @@
// |kMinElidedBubbleWidth|.
const float kMaxBubbleFraction = 0.5;
-// The base text color used for non-MD. The color tuples are stolen from
-// location_bar_view_gtk.cc.
-const SkColor kBaseTextColor = SkColorSetRGB(0x07, 0x95, 0x00);
-
// Duration of animation in ms.
const NSTimeInterval kInAnimationDuration = 330;
const NSTimeInterval kOutAnimationDuration = 250;
@@ -76,20 +72,16 @@
animation_(this),
owner_(owner),
disable_animations_during_testing_(false) {
- if (ui::MaterialDesignController::IsModeMaterial()) {
- // On Retina the text label is 1px above the Omnibox textfield's text
- // baseline. If the Omnibox textfield also drew the label the baselines
- // would align.
- SetRetinaBaselineOffset(kRetinaBaselineOffset);
-
- base::scoped_nsobject<NSMutableParagraphStyle> style(
- [[NSMutableParagraphStyle alloc] init]);
- [style setLineBreakMode:NSLineBreakByClipping];
- [attributes_ setObject:style forKey:NSParagraphStyleAttributeName];
- animation_.SetTweenType(gfx::Tween::FAST_OUT_SLOW_IN);
- } else {
- SetTextColor(skia::SkColorToSRGBNSColor(kBaseTextColor));
- }
+ // On Retina the text label is 1px above the Omnibox textfield's text
+ // baseline. If the Omnibox textfield also drew the label the baselines
+ // would align.
+ SetRetinaBaselineOffset(kRetinaBaselineOffset);
+
+ base::scoped_nsobject<NSMutableParagraphStyle> style(
+ [[NSMutableParagraphStyle alloc] init]);
+ [style setLineBreakMode:NSLineBreakByClipping];
+ [attributes_ setObject:style forKey:NSParagraphStyleAttributeName];
+ animation_.SetTweenType(gfx::Tween::FAST_OUT_SLOW_IN);
}
SecurityStateBubbleDecoration::~SecurityStateBubbleDecoration() {
@@ -143,9 +135,6 @@
// SecurityStateBubbleDecoration::LocationBarDecoration:
CGFloat SecurityStateBubbleDecoration::GetWidthForSpace(CGFloat width) {
- if (!ui::MaterialDesignController::IsModeMaterial())
- return GetWidthForText(width);
-
CGFloat location_icon_width = location_icon_->GetWidthForSpace(width);
CGFloat text_width = GetWidthForText(width) - location_icon_width;
return (text_width * GetAnimationProgress()) + location_icon_width;
@@ -255,12 +244,6 @@
NSRect background_frame,
NSRect frame,
NSView* control_view) {
- if (!ui::MaterialDesignController::IsModeMaterial()) {
- BubbleDecoration::DrawWithBackgroundInFrame(background_frame, frame,
- control_view);
- return;
- }
-
NSRect rect = NSInsetRect(background_frame, 0, 3);
rect.size.width -= kRightSideMargin;
@@ -335,9 +318,6 @@
// SecurityStateBubbleDecoration, private:
CGFloat SecurityStateBubbleDecoration::GetAnimationProgress() const {
- if (!ui::MaterialDesignController::IsModeMaterial())
- return 1.0;
-
if (disable_animations_during_testing_)
return 1.0;

Powered by Google App Engine
This is Rietveld 408576698