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

Unified Diff: chrome/browser/ui/cocoa/location_bar/bubble_decoration.h

Issue 2119033002: [Material][Mac] Implement Omnibox Verbose State Chips (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nit Created 4 years, 4 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/bubble_decoration.h
diff --git a/chrome/browser/ui/cocoa/location_bar/bubble_decoration.h b/chrome/browser/ui/cocoa/location_bar/bubble_decoration.h
index 53815888f144b2eeb4f66e44bc78d0453b174d80..0262ad6592dae56cd096e37bea9631c8d3c71d6d 100644
--- a/chrome/browser/ui/cocoa/location_bar/bubble_decoration.h
+++ b/chrome/browser/ui/cocoa/location_bar/bubble_decoration.h
@@ -40,6 +40,10 @@ class BubbleDecoration : public LocationBarDecoration {
NSFont* GetFont() const override;
protected:
+ // Returns the amount of padding between the divider and the omnibox text.
+ // Returns 0 in non-MD since there's no divider.
+ CGFloat DividerPadding() const;
+
// Helper returning bubble width for the given |image| and |label|
// assuming |font_| (for sizing text). Arguments can be nil.
CGFloat GetWidthForImageAndLabel(NSImage* image, NSString* label);
@@ -48,20 +52,20 @@ class BubbleDecoration : public LocationBarDecoration {
// from. |frame| is the decoration's frame in the containing cell.
NSRect GetImageRectInFrame(NSRect frame);
+ // Image drawn in the left side of the bubble.
+ base::scoped_nsobject<NSImage> image_;
+
+ // Contains attribute for drawing |label_|.
+ base::scoped_nsobject<NSMutableDictionary> attributes_;
+
private:
friend class SelectedKeywordDecorationTest;
FRIEND_TEST_ALL_PREFIXES(SelectedKeywordDecorationTest,
UsesPartialKeywordIfNarrow);
- // Image drawn in the left side of the bubble.
- base::scoped_nsobject<NSImage> image_;
-
// Label to draw to right of image. Can be |nil|.
base::scoped_nsobject<NSString> label_;
- // Contains attribute for drawing |label_|.
- base::scoped_nsobject<NSMutableDictionary> attributes_;
-
// Contains any Retina-only baseline adjustment for |label_|.
CGFloat retina_baseline_offset_;

Powered by Google App Engine
This is Rietveld 408576698