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

Side by Side Diff: ui/message_center/cocoa/settings_controller.h

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol Created 7 years, 5 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 UI_MESSAGE_CENTER_COCOA_SETTINGS_CONTROLLER_H_ 5 #ifndef UI_MESSAGE_CENTER_COCOA_SETTINGS_CONTROLLER_H_
6 #define UI_MESSAGE_CENTER_COCOA_SETTINGS_CONTROLLER_H_ 6 #define UI_MESSAGE_CENTER_COCOA_SETTINGS_CONTROLLER_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #import "base/memory/scoped_nsobject.h" 10 #import "base/mac/scoped_nsobject.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "ui/message_center/message_center_export.h" 12 #include "ui/message_center/message_center_export.h"
13 #include "ui/message_center/notifier_settings.h" 13 #include "ui/message_center/notifier_settings.h"
14 14
15 @class MCSettingsController; 15 @class MCSettingsController;
16 16
17 namespace message_center { 17 namespace message_center {
18 18
19 // Bridge class between C++ and Cocoa world. 19 // Bridge class between C++ and Cocoa world.
20 class NotifierSettingsObserverMac : public NotifierSettingsObserver { 20 class NotifierSettingsObserverMac : public NotifierSettingsObserver {
(...skipping 17 matching lines...) Expand all
38 38
39 39
40 // The view controller responsible for the settings sheet in the center. 40 // The view controller responsible for the settings sheet in the center.
41 MESSAGE_CENTER_EXPORT 41 MESSAGE_CENTER_EXPORT
42 @interface MCSettingsController : NSViewController { 42 @interface MCSettingsController : NSViewController {
43 @private 43 @private
44 scoped_ptr<message_center::NotifierSettingsObserverMac> observer_; 44 scoped_ptr<message_center::NotifierSettingsObserverMac> observer_;
45 message_center::NotifierSettingsProvider* provider_; 45 message_center::NotifierSettingsProvider* provider_;
46 46
47 // The "Settings" text at the top. 47 // The "Settings" text at the top.
48 scoped_nsobject<NSTextField> settingsText_; 48 base::scoped_nsobject<NSTextField> settingsText_;
49 49
50 // The smaller text below the "Settings" text. 50 // The smaller text below the "Settings" text.
51 scoped_nsobject<NSTextField> detailsText_; 51 base::scoped_nsobject<NSTextField> detailsText_;
52 52
53 // Container for all the checkboxes. 53 // Container for all the checkboxes.
54 scoped_nsobject<NSScrollView> scrollView_; 54 base::scoped_nsobject<NSScrollView> scrollView_;
55 55
56 std::vector<message_center::Notifier*> notifiers_; 56 std::vector<message_center::Notifier*> notifiers_;
57 } 57 }
58 58
59 // Designated initializer. 59 // Designated initializer.
60 - (id)initWithProvider:(message_center::NotifierSettingsProvider*)provider; 60 - (id)initWithProvider:(message_center::NotifierSettingsProvider*)provider;
61 61
62 @end 62 @end
63 63
64 // Testing API ///////////////////////////////////////////////////////////////// 64 // Testing API /////////////////////////////////////////////////////////////////
65 65
66 @interface MCSettingsController (TestingAPI) 66 @interface MCSettingsController (TestingAPI)
67 - (NSScrollView*)scrollView; 67 - (NSScrollView*)scrollView;
68 @end 68 @end
69 69
70 #endif // UI_MESSAGE_CENTER_COCOA_SETTINGS_CONTROLLER_H_ 70 #endif // UI_MESSAGE_CENTER_COCOA_SETTINGS_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698