| 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 #include <map> | 5 #include <map> |
| 6 | 6 |
| 7 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> |
| 8 | 8 |
| 9 #include "base/macros.h" |
| 9 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 10 #import "chrome/browser/ui/cocoa/base_bubble_controller.h" | 11 #import "chrome/browser/ui/cocoa/base_bubble_controller.h" |
| 11 #include "content/public/common/media_stream_request.h" | 12 #include "content/public/common/media_stream_request.h" |
| 12 | 13 |
| 13 class ContentSettingBubbleModel; | 14 class ContentSettingBubbleModel; |
| 14 class ContentSettingBubbleWebContentsObserverBridge; | 15 class ContentSettingBubbleWebContentsObserverBridge; |
| 15 class ContentSettingMediaMenuModel; | 16 class ContentSettingMediaMenuModel; |
| 16 @class InfoBubbleView; | 17 @class InfoBubbleView; |
| 17 | 18 |
| 18 namespace content { | 19 namespace content { |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 - (IBAction)mediaMenuChanged:(id)sender; | 100 - (IBAction)mediaMenuChanged:(id)sender; |
| 100 | 101 |
| 101 @end | 102 @end |
| 102 | 103 |
| 103 @interface ContentSettingBubbleController (TestingAPI) | 104 @interface ContentSettingBubbleController (TestingAPI) |
| 104 | 105 |
| 105 // Returns the weak reference to the |mediaMenus_|. | 106 // Returns the weak reference to the |mediaMenus_|. |
| 106 - (content_setting_bubble::MediaMenuPartsMap*)mediaMenus; | 107 - (content_setting_bubble::MediaMenuPartsMap*)mediaMenus; |
| 107 | 108 |
| 108 @end | 109 @end |
| OLD | NEW |