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

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

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 47
48 private: 48 private:
49 friend ZoomDecorationTest; 49 friend ZoomDecorationTest;
50 50
51 bool IsAtDefaultZoom() const; 51 bool IsAtDefaultZoom() const;
52 52
53 // Virtual for testing. 53 // Virtual for testing.
54 virtual bool ShouldShowDecoration() const; 54 virtual bool ShouldShowDecoration() const;
55 55
56 // LocationBarDecoration implementation. 56 // LocationBarDecoration implementation.
57 virtual bool AcceptsMousePress() OVERRIDE; 57 virtual bool AcceptsMousePress() override;
58 virtual bool OnMousePressed(NSRect frame, NSPoint location) OVERRIDE; 58 virtual bool OnMousePressed(NSRect frame, NSPoint location) override;
59 virtual NSString* GetToolTip() OVERRIDE; 59 virtual NSString* GetToolTip() override;
60 virtual NSPoint GetBubblePointInFrame(NSRect frame) OVERRIDE; 60 virtual NSPoint GetBubblePointInFrame(NSRect frame) override;
61 61
62 // ZoomBubbleControllerDelegate implementation. 62 // ZoomBubbleControllerDelegate implementation.
63 virtual content::WebContents* GetWebContents() OVERRIDE; 63 virtual content::WebContents* GetWebContents() override;
64 virtual void OnClose() OVERRIDE; 64 virtual void OnClose() override;
65 65
66 // The control that owns this. Weak. 66 // The control that owns this. Weak.
67 LocationBarViewMac* owner_; 67 LocationBarViewMac* owner_;
68 68
69 // The bubble that this decoration shows. Weak, owns self. 69 // The bubble that this decoration shows. Weak, owns self.
70 ZoomBubbleController* bubble_; 70 ZoomBubbleController* bubble_;
71 71
72 // The string to show for a tooltip. 72 // The string to show for a tooltip.
73 base::scoped_nsobject<NSString> tooltip_; 73 base::scoped_nsobject<NSString> tooltip_;
74 74
75 DISALLOW_COPY_AND_ASSIGN(ZoomDecoration); 75 DISALLOW_COPY_AND_ASSIGN(ZoomDecoration);
76 }; 76 };
77 77
78 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_ZOOM_DECORATION_H_ 78 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_ZOOM_DECORATION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698