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

Side by Side Diff: chrome/browser/ui/cocoa/location_bar/zoom_decoration.h

Issue 12315069: Mac: Update zoom bubble UI (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address review comments Created 7 years, 9 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_COCOA_LOCATION_BAR_ZOOM_DECORATION_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_LOCATION_BAR_ZOOM_DECORATION_H_
6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_ZOOM_DECORATION_H_ 6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_ZOOM_DECORATION_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "chrome/browser/ui/cocoa/location_bar/image_decoration.h" 11 #include "chrome/browser/ui/cocoa/location_bar/image_decoration.h"
12 12
13 class LocationBarViewMac; 13 class LocationBarViewMac;
14 @class ZoomBubbleController; 14 @class ZoomBubbleController;
15 class ZoomController; 15 class ZoomController;
16 class ZoomDecorationTest;
16 17
17 // Zoom icon at the end of the omnibox (close to page actions) when at a 18 // Zoom icon at the end of the omnibox (close to page actions) when at a
18 // non-standard zoom level. 19 // non-standard zoom level.
19 class ZoomDecoration : public ImageDecoration { 20 class ZoomDecoration : public ImageDecoration {
20 public: 21 public:
21 explicit ZoomDecoration(LocationBarViewMac* owner); 22 explicit ZoomDecoration(LocationBarViewMac* owner);
22 virtual ~ZoomDecoration(); 23 virtual ~ZoomDecoration();
23 24
24 // Called when this decoration should show or hide itself in its most current 25 // Called when this decoration should show or hide itself in its most current
25 // state. 26 // state.
26 void Update(ZoomController* zoom_controller); 27 void Update(ZoomController* zoom_controller);
27 28
28 // Shows the zoom bubble for this decoration. If |auto_close| is YES, then 29 // Shows the zoom bubble for this decoration. If |auto_close| is YES, then
29 // the bubble will automatically close after a fixed period of time. 30 // the bubble will automatically close after a fixed period of time.
30 void ShowBubble(BOOL auto_close); 31 void ShowBubble(BOOL auto_close);
31 32
32 private: 33 private:
34 friend ZoomDecorationTest;
35
33 NSPoint GetBubblePointInFrame(NSRect frame); 36 NSPoint GetBubblePointInFrame(NSRect frame);
37 bool IsAtDefaultZoom() const;
38 bool ShouldShowDecoration() const;
34 39
35 // LocationBarDecoration implementation. 40 // LocationBarDecoration implementation.
36 virtual bool AcceptsMousePress() OVERRIDE; 41 virtual bool AcceptsMousePress() OVERRIDE;
37 virtual bool OnMousePressed(NSRect frame) OVERRIDE; 42 virtual bool OnMousePressed(NSRect frame) OVERRIDE;
38 virtual NSString* GetToolTip() OVERRIDE; 43 virtual NSString* GetToolTip() OVERRIDE;
39 44
40 // The control that owns this. Weak. 45 // The control that owns this. Weak.
41 LocationBarViewMac* owner_; 46 LocationBarViewMac* owner_;
42 47
43 // The bubble that this decoration shows. Weak, owns self. 48 // The bubble that this decoration shows. Weak, owns self.
44 ZoomBubbleController* bubble_; 49 ZoomBubbleController* bubble_;
45 50
46 // The string to show for a tooltip. 51 // The string to show for a tooltip.
47 scoped_nsobject<NSString> tooltip_; 52 scoped_nsobject<NSString> tooltip_;
48 53
49 DISALLOW_COPY_AND_ASSIGN(ZoomDecoration); 54 DISALLOW_COPY_AND_ASSIGN(ZoomDecoration);
50 }; 55 };
51 56
52 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_ZOOM_DECORATION_H_ 57 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_ZOOM_DECORATION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698