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

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

Issue 867183006: Revert of Allow new zoom bubble to override current one. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
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"
(...skipping 15 matching lines...) Expand all
26 public: 26 public:
27 explicit ZoomDecoration(LocationBarViewMac* owner); 27 explicit ZoomDecoration(LocationBarViewMac* owner);
28 ~ZoomDecoration() override; 28 ~ZoomDecoration() override;
29 29
30 // Called when this decoration should show or hide itself in its most current 30 // Called when this decoration should show or hide itself in its most current
31 // state. Returns whether any updates were made. 31 // state. Returns whether any updates were made.
32 bool UpdateIfNecessary(ui_zoom::ZoomController* zoom_controller); 32 bool UpdateIfNecessary(ui_zoom::ZoomController* zoom_controller);
33 33
34 // Shows the zoom bubble for this decoration. If |auto_close| is YES, then 34 // Shows the zoom bubble for this decoration. If |auto_close| is YES, then
35 // the bubble will automatically close after a fixed period of time. 35 // the bubble will automatically close after a fixed period of time.
36 // If a bubble is already showing, the |auto_close| timer is reset.
37 void ShowBubble(BOOL auto_close); 36 void ShowBubble(BOOL auto_close);
38 37
39 // Closes the zoom bubble. 38 // Closes the zoom bubble.
40 void CloseBubble(); 39 void CloseBubble();
41 40
42 protected: 41 protected:
43 // Hides all UI associated with the zoom decoration. 42 // Hides all UI associated with the zoom decoration.
44 // Virtual and protected for testing. 43 // Virtual and protected for testing.
45 virtual void HideUI(); 44 virtual void HideUI();
46 45
(...skipping 26 matching lines...) Expand all
73 // The bubble that this decoration shows. Weak, owns self. 72 // The bubble that this decoration shows. Weak, owns self.
74 ZoomBubbleController* bubble_; 73 ZoomBubbleController* bubble_;
75 74
76 // The string to show for a tooltip. 75 // The string to show for a tooltip.
77 base::scoped_nsobject<NSString> tooltip_; 76 base::scoped_nsobject<NSString> tooltip_;
78 77
79 DISALLOW_COPY_AND_ASSIGN(ZoomDecoration); 78 DISALLOW_COPY_AND_ASSIGN(ZoomDecoration);
80 }; 79 };
81 80
82 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_ZOOM_DECORATION_H_ 81 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_ZOOM_DECORATION_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/browser/zoom_bubble_controller.mm ('k') | chrome/browser/ui/cocoa/location_bar/zoom_decoration.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698