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

Side by Side Diff: chrome/browser/ui/cocoa/notifications/balloon_controller.h

Issue 6327017: Fix crash when notification disappears under popup menu. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: change per review Created 9 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/notifications/balloon_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) 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
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
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_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/notifications/balloon_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698