| OLD | NEW | 
|---|
| 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/mac/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 #import "ui/message_center/cocoa/opaque_views.h" | 
| 12 #import "ui/message_center/cocoa/settings_entry_view.h" | 13 #import "ui/message_center/cocoa/settings_entry_view.h" | 
| 13 #include "ui/message_center/message_center_export.h" | 14 #include "ui/message_center/message_center_export.h" | 
| 14 #include "ui/message_center/notifier_settings.h" | 15 #include "ui/message_center/notifier_settings.h" | 
| 15 | 16 | 
| 16 @class MCSettingsController; | 17 @class MCSettingsController; | 
| 17 @class MCTrayViewController; | 18 @class MCTrayViewController; | 
| 18 | 19 | 
| 19 namespace message_center { | 20 namespace message_center { | 
| 20 | 21 | 
| 21 // Bridge class between C++ and Cocoa world. | 22 // Bridge class between C++ and Cocoa world. | 
| (...skipping 24 matching lines...) Expand all  Loading... | 
| 46   message_center::NotifierSettingsProvider* provider_; | 47   message_center::NotifierSettingsProvider* provider_; | 
| 47   MCTrayViewController* trayViewController_;  // Weak. Owns us. | 48   MCTrayViewController* trayViewController_;  // Weak. Owns us. | 
| 48 | 49 | 
| 49   // The "Settings" text at the top. | 50   // The "Settings" text at the top. | 
| 50   base::scoped_nsobject<NSTextField> settingsText_; | 51   base::scoped_nsobject<NSTextField> settingsText_; | 
| 51 | 52 | 
| 52   // The smaller text below the "Settings" text. | 53   // The smaller text below the "Settings" text. | 
| 53   base::scoped_nsobject<NSTextField> detailsText_; | 54   base::scoped_nsobject<NSTextField> detailsText_; | 
| 54 | 55 | 
| 55   // The profile switcher. | 56   // The profile switcher. | 
| 56   base::scoped_nsobject<NSPopUpButton> groupDropDownButton_; | 57   base::scoped_nsobject<MCDropDown> groupDropDownButton_; | 
| 57 | 58 | 
| 58   // Container for all the checkboxes. | 59   // Container for all the checkboxes. | 
| 59   base::scoped_nsobject<NSScrollView> scrollView_; | 60   base::scoped_nsobject<NSScrollView> scrollView_; | 
| 60 | 61 | 
| 61   std::vector<message_center::Notifier*> notifiers_; | 62   std::vector<message_center::Notifier*> notifiers_; | 
| 62 } | 63 } | 
| 63 | 64 | 
| 64 // Designated initializer. | 65 // Designated initializer. | 
| 65 - (id)initWithProvider:(message_center::NotifierSettingsProvider*)provider | 66 - (id)initWithProvider:(message_center::NotifierSettingsProvider*)provider | 
| 66     trayViewController:(MCTrayViewController*)trayViewController; | 67     trayViewController:(MCTrayViewController*)trayViewController; | 
| (...skipping 12 matching lines...) Expand all  Loading... | 
| 79 @end | 80 @end | 
| 80 | 81 | 
| 81 // Testing API ///////////////////////////////////////////////////////////////// | 82 // Testing API ///////////////////////////////////////////////////////////////// | 
| 82 | 83 | 
| 83 @interface MCSettingsController (TestingAPI) | 84 @interface MCSettingsController (TestingAPI) | 
| 84 - (NSPopUpButton*)groupDropDownButton; | 85 - (NSPopUpButton*)groupDropDownButton; | 
| 85 - (NSScrollView*)scrollView; | 86 - (NSScrollView*)scrollView; | 
| 86 @end | 87 @end | 
| 87 | 88 | 
| 88 #endif  // UI_MESSAGE_CENTER_COCOA_SETTINGS_CONTROLLER_H_ | 89 #endif  // UI_MESSAGE_CENTER_COCOA_SETTINGS_CONTROLLER_H_ | 
| OLD | NEW | 
|---|