| OLD | NEW |
| 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 #import <Cocoa/Cocoa.h> | 5 #import <Cocoa/Cocoa.h> |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 } | 46 } |
| 47 }; | 47 }; |
| 48 typedef std::map<NSPopUpButton*, MediaMenuParts*, compare_button> | 48 typedef std::map<NSPopUpButton*, MediaMenuParts*, compare_button> |
| 49 MediaMenuPartsMap; | 49 MediaMenuPartsMap; |
| 50 } // namespace content_setting_bubble | 50 } // namespace content_setting_bubble |
| 51 | 51 |
| 52 // Manages a "content blocked" bubble. | 52 // Manages a "content blocked" bubble. |
| 53 @interface ContentSettingBubbleController : BaseBubbleController { | 53 @interface ContentSettingBubbleController : BaseBubbleController { |
| 54 @private | 54 @private |
| 55 IBOutlet NSTextField* titleLabel_; | 55 IBOutlet NSTextField* titleLabel_; |
| 56 IBOutlet NSTextField* messageLabel_; |
| 56 IBOutlet NSMatrix* allowBlockRadioGroup_; | 57 IBOutlet NSMatrix* allowBlockRadioGroup_; |
| 57 | 58 |
| 58 IBOutlet NSButton* manageButton_; | 59 IBOutlet NSButton* manageButton_; |
| 59 IBOutlet NSButton* doneButton_; | 60 IBOutlet NSButton* doneButton_; |
| 60 IBOutlet NSButton* loadButton_; | 61 IBOutlet NSButton* loadButton_; |
| 61 | 62 |
| 62 // The container for the bubble contents of the geolocation bubble. | 63 // The container for the bubble contents of the geolocation bubble. |
| 63 IBOutlet NSView* contentsContainer_; | 64 IBOutlet NSView* contentsContainer_; |
| 64 | 65 |
| 65 IBOutlet NSTextField* blockedResourcesField_; | 66 IBOutlet NSTextField* blockedResourcesField_; |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 - (IBAction)mediaMenuChanged:(id)sender; | 102 - (IBAction)mediaMenuChanged:(id)sender; |
| 102 | 103 |
| 103 @end | 104 @end |
| 104 | 105 |
| 105 @interface ContentSettingBubbleController (TestingAPI) | 106 @interface ContentSettingBubbleController (TestingAPI) |
| 106 | 107 |
| 107 // Returns the weak reference to the |mediaMenus_|. | 108 // Returns the weak reference to the |mediaMenus_|. |
| 108 - (content_setting_bubble::MediaMenuPartsMap*)mediaMenus; | 109 - (content_setting_bubble::MediaMenuPartsMap*)mediaMenus; |
| 109 | 110 |
| 110 @end | 111 @end |
| OLD | NEW |