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

Side by Side Diff: chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.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_EXTENSIONS_MEDIA_GALLERIES_DIALOG_COCOA_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_EXTENSIONS_MEDIA_GALLERIES_DIALOG_COCOA_H_
6 #define CHROME_BROWSER_UI_COCOA_EXTENSIONS_MEDIA_GALLERIES_DIALOG_COCOA_H_ 6 #define CHROME_BROWSER_UI_COCOA_EXTENSIONS_MEDIA_GALLERIES_DIALOG_COCOA_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
(...skipping 24 matching lines...) Expand all
35 virtual ~MediaGalleriesDialogCocoa(); 35 virtual ~MediaGalleriesDialogCocoa();
36 36
37 // Called when the user clicks the accept button. 37 // Called when the user clicks the accept button.
38 void OnAcceptClicked(); 38 void OnAcceptClicked();
39 // Called when the user clicks the cancel button. 39 // Called when the user clicks the cancel button.
40 void OnCancelClicked(); 40 void OnCancelClicked();
41 // Called when the user clicks the auxiliary button. 41 // Called when the user clicks the auxiliary button.
42 void OnAuxiliaryButtonClicked(); 42 void OnAuxiliaryButtonClicked();
43 43
44 // MediaGalleriesDialog implementation: 44 // MediaGalleriesDialog implementation:
45 virtual void UpdateGalleries() OVERRIDE; 45 virtual void UpdateGalleries() override;
46 46
47 // ConstrainedWindowMacDelegate implementation. 47 // ConstrainedWindowMacDelegate implementation.
48 virtual void OnConstrainedWindowClosed( 48 virtual void OnConstrainedWindowClosed(
49 ConstrainedWindowMac* window) OVERRIDE; 49 ConstrainedWindowMac* window) override;
50 50
51 // MediaGalleryListEntryController implementation. 51 // MediaGalleryListEntryController implementation.
52 virtual void OnCheckboxToggled(MediaGalleryPrefId pref_id, 52 virtual void OnCheckboxToggled(MediaGalleryPrefId pref_id,
53 bool checked) OVERRIDE; 53 bool checked) override;
54 virtual void OnFolderViewerClicked(MediaGalleryPrefId prefId) OVERRIDE; 54 virtual void OnFolderViewerClicked(MediaGalleryPrefId prefId) override;
55 virtual ui::MenuModel* GetContextMenu(MediaGalleryPrefId pref_id) OVERRIDE; 55 virtual ui::MenuModel* GetContextMenu(MediaGalleryPrefId pref_id) override;
56 56
57 private: 57 private:
58 FRIEND_TEST_ALL_PREFIXES(MediaGalleriesDialogBrowserTest, Close); 58 FRIEND_TEST_ALL_PREFIXES(MediaGalleriesDialogBrowserTest, Close);
59 FRIEND_TEST_ALL_PREFIXES(MediaGalleriesDialogTest, InitializeCheckboxes); 59 FRIEND_TEST_ALL_PREFIXES(MediaGalleriesDialogTest, InitializeCheckboxes);
60 FRIEND_TEST_ALL_PREFIXES(MediaGalleriesDialogTest, ToggleCheckboxes); 60 FRIEND_TEST_ALL_PREFIXES(MediaGalleriesDialogTest, ToggleCheckboxes);
61 FRIEND_TEST_ALL_PREFIXES(MediaGalleriesDialogTest, UpdateAdds); 61 FRIEND_TEST_ALL_PREFIXES(MediaGalleriesDialogTest, UpdateAdds);
62 FRIEND_TEST_ALL_PREFIXES(MediaGalleriesDialogTest, ForgetDeletes); 62 FRIEND_TEST_ALL_PREFIXES(MediaGalleriesDialogTest, ForgetDeletes);
63 63
64 // MediaGalleriesDialog implementation: 64 // MediaGalleriesDialog implementation:
65 virtual void AcceptDialogForTesting() OVERRIDE; 65 virtual void AcceptDialogForTesting() override;
66 66
67 void InitDialogControls(); 67 void InitDialogControls();
68 CGFloat CreateCheckboxes( 68 CGFloat CreateCheckboxes(
69 CGFloat y_pos, 69 CGFloat y_pos,
70 const MediaGalleriesDialogController::Entries& entries); 70 const MediaGalleriesDialogController::Entries& entries);
71 CGFloat CreateCheckboxSeparator(CGFloat y_pos, NSString* header); 71 CGFloat CreateCheckboxSeparator(CGFloat y_pos, NSString* header);
72 72
73 MediaGalleriesDialogController* controller_; // weak 73 MediaGalleriesDialogController* controller_; // weak
74 scoped_ptr<ConstrainedWindowMac> window_; 74 scoped_ptr<ConstrainedWindowMac> window_;
75 75
76 // The alert that the dialog is being displayed as. 76 // The alert that the dialog is being displayed as.
77 base::scoped_nsobject<ConstrainedWindowAlert> alert_; 77 base::scoped_nsobject<ConstrainedWindowAlert> alert_;
78 78
79 // True if the user has pressed accept. 79 // True if the user has pressed accept.
80 bool accepted_; 80 bool accepted_;
81 81
82 // Container view for checkboxes. 82 // Container view for checkboxes.
83 base::scoped_nsobject<NSView> checkbox_container_; 83 base::scoped_nsobject<NSView> checkbox_container_;
84 84
85 // Container view for the main dialog contents. 85 // Container view for the main dialog contents.
86 base::scoped_nsobject<NSBox> main_container_; 86 base::scoped_nsobject<NSBox> main_container_;
87 87
88 // An Objective-C class to route callbacks from Cocoa code. 88 // An Objective-C class to route callbacks from Cocoa code.
89 base::scoped_nsobject<MediaGalleriesCocoaController> cocoa_controller_; 89 base::scoped_nsobject<MediaGalleriesCocoaController> cocoa_controller_;
90 90
91 DISALLOW_COPY_AND_ASSIGN(MediaGalleriesDialogCocoa); 91 DISALLOW_COPY_AND_ASSIGN(MediaGalleriesDialogCocoa);
92 }; 92 };
93 93
94 #endif // CHROME_BROWSER_UI_COCOA_EXTENSIONS_MEDIA_GALLERIES_DIALOG_COCOA_H_ 94 #endif // CHROME_BROWSER_UI_COCOA_EXTENSIONS_MEDIA_GALLERIES_DIALOG_COCOA_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698