| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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_NOTIFICATIONS_BALLOON_CONTROLLER_H_ | 5 #ifndef CHROME_BROWSER_UI_COCOA_NOTIFICATIONS_BALLOON_CONTROLLER_H_ |
| 6 #define CHROME_BROWSER_UI_COCOA_NOTIFICATIONS_BALLOON_CONTROLLER_H_ | 6 #define CHROME_BROWSER_UI_COCOA_NOTIFICATIONS_BALLOON_CONTROLLER_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #import <Cocoa/Cocoa.h> | 9 #import <Cocoa/Cocoa.h> |
| 10 | 10 |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 // The origin label. | 45 // The origin label. |
| 46 IBOutlet NSTextField* originLabel_; | 46 IBOutlet NSTextField* originLabel_; |
| 47 | 47 |
| 48 // The options menu that appears when "options" is pressed. | 48 // The options menu that appears when "options" is pressed. |
| 49 IBOutlet HoverImageButton* optionsButton_; | 49 IBOutlet HoverImageButton* optionsButton_; |
| 50 scoped_ptr<NotificationOptionsMenuModel> menuModel_; | 50 scoped_ptr<NotificationOptionsMenuModel> menuModel_; |
| 51 scoped_nsobject<MenuController> menuController_; | 51 scoped_nsobject<MenuController> menuController_; |
| 52 | 52 |
| 53 // The host for the renderer of the HTML contents. | 53 // The host for the renderer of the HTML contents. |
| 54 scoped_ptr<BalloonViewHost> htmlContents_; | 54 scoped_ptr<BalloonViewHost> htmlContents_; |
| 55 |
| 56 // Variables to delay close requested by script while showing modal menu. |
| 57 BOOL optionMenuIsActive_; |
| 58 BOOL delayedClose_; |
| 55 } | 59 } |
| 56 | 60 |
| 57 // Initialize with a balloon object containing the notification data. | 61 // Initialize with a balloon object containing the notification data. |
| 58 - (id)initWithBalloon:(Balloon*)balloon; | 62 - (id)initWithBalloon:(Balloon*)balloon; |
| 59 | 63 |
| 60 // Callback function for the close button. | 64 // Callback function for the close button. |
| 61 - (IBAction)closeButtonPressed:(id)sender; | 65 - (IBAction)closeButtonPressed:(id)sender; |
| 62 | 66 |
| 63 // Callback function for the options button. | 67 // Callback function for the options button. |
| 64 - (IBAction)optionsButtonPressed:(id)sender; | 68 - (IBAction)optionsButtonPressed:(id)sender; |
| (...skipping 18 matching lines...) Expand all Loading... |
| 83 | 87 |
| 84 // The BalloonHost | 88 // The BalloonHost |
| 85 - (BalloonViewHost*)getHost; | 89 - (BalloonViewHost*)getHost; |
| 86 @end | 90 @end |
| 87 | 91 |
| 88 @interface BalloonController (UnitTesting) | 92 @interface BalloonController (UnitTesting) |
| 89 - (void)initializeHost; | 93 - (void)initializeHost; |
| 90 @end | 94 @end |
| 91 | 95 |
| 92 #endif // CHROME_BROWSER_UI_COCOA_NOTIFICATIONS_BALLOON_CONTROLLER_H_ | 96 #endif // CHROME_BROWSER_UI_COCOA_NOTIFICATIONS_BALLOON_CONTROLLER_H_ |
| OLD | NEW |