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

Side by Side Diff: chrome/browser/ui/cocoa/infobars/media_stream_infobar_controller.h

Issue 10802090: fixed the distorted behavior on the mediastreaminfobar on Mac (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rebased and addressed the comments Created 8 years, 4 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
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/infobars/media_stream_infobar_controller.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_INFOBARS_MEDIA_STREAM_INFOBAR_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_INFOBARS_MEDIA_STREAM_INFOBAR_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_COCOA_INFOBARS_MEDIA_STREAM_INFOBAR_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_COCOA_INFOBARS_MEDIA_STREAM_INFOBAR_CONTROLLER_H_
7 7
8 #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h" 8 #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h"
9 9
10 #import "base/memory/scoped_nsobject.h" 10 #import "base/memory/scoped_nsobject.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 12
13 class InfoBarTabHelper; 13 class InfoBarTabHelper;
14 class MediaStreamDevicesMenuModel; 14 class MediaStreamDevicesMenuModel;
15 class MediaStreamInfoBarDelegate; 15 class MediaStreamInfoBarDelegate;
16 @class NSButton; 16 @class NSButton;
17 @class NSPopUpButton; 17 @class NSPopUpButton;
18 @class NSTextField; 18 @class NSTextField;
19 19
20 // The class handles the Mac OS X specifics for the MediaStream infobar allowing 20 // The class handles the Mac OS X specifics for the MediaStream infobar allowing
21 // or denying capture device usage. 21 // or denying capture device usage.
22 @interface MediaStreamInfoBarController : InfoBarController { 22 @interface MediaStreamInfoBarController : InfoBarController {
23 @protected 23 @protected
24 // Contains all text displayed on the infobar. 24 // Contains all text displayed on the infobar.
25 scoped_nsobject<NSTextField> label1_; 25 scoped_nsobject<NSTextField> label1_;
26 // Contains a list of video and audio capture devices. 26 // Contains a list of video and audio capture devices.
27 scoped_nsobject<NSPopUpButton> deviceMenu_; 27 scoped_nsobject<NSPopUpButton> deviceMenu_;
28 // Menu model for MediaStream capture devices. 28 // Menu model for MediaStream capture devices.
29 scoped_ptr<MediaStreamDevicesMenuModel> deviceMenuModel_; 29 scoped_ptr<MediaStreamDevicesMenuModel> deviceMenuModel_;
30 // Space between controls in pixels - generated from the NIB.
31 CGFloat spaceBetweenControls_;
30 } 32 }
31 33
32 - (id)initWithDelegate:(MediaStreamInfoBarDelegate*)delegate 34 - (id)initWithDelegate:(MediaStreamInfoBarDelegate*)delegate
33 owner:(InfoBarTabHelper*)owner; 35 owner:(InfoBarTabHelper*)owner;
34 36
35 // Called when the selection in the device menu has changed. 37 // Called when the selection in the device menu has changed.
36 - (IBAction)deviceMenuChanged:(id)sender; 38 - (IBAction)deviceMenuChanged:(id)sender;
37 39
38 @end 40 @end
39 41
40 #endif // CHROME_BROWSER_UI_COCOA_INFOBARS_MEDIA_STREAM_INFOBAR_CONTROLLER_H_ 42 #endif // CHROME_BROWSER_UI_COCOA_INFOBARS_MEDIA_STREAM_INFOBAR_CONTROLLER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/infobars/media_stream_infobar_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698