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

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

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol Created 7 years, 6 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
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_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 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/memory/scoped_nsobject.h" 10 #include "base/mac/scoped_nsobject.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 12
13 class Balloon; 13 class Balloon;
14 @class BalloonContentViewCocoa; 14 @class BalloonContentViewCocoa;
15 @class BalloonShelfViewCocoa; 15 @class BalloonShelfViewCocoa;
16 class BalloonViewHost; 16 class BalloonViewHost;
17 @class HoverImageButton; 17 @class HoverImageButton;
18 @class MenuController; 18 @class MenuController;
19 class NotificationOptionsMenuModel; 19 class NotificationOptionsMenuModel;
20 20
(...skipping 18 matching lines...) Expand all
39 39
40 // Tracking region for the close button. 40 // Tracking region for the close button.
41 int closeButtonTrackingTag_; 41 int closeButtonTrackingTag_;
42 42
43 // The origin label. 43 // The origin label.
44 IBOutlet NSTextField* originLabel_; 44 IBOutlet NSTextField* originLabel_;
45 45
46 // The options menu that appears when "options" is pressed. 46 // The options menu that appears when "options" is pressed.
47 IBOutlet HoverImageButton* optionsButton_; 47 IBOutlet HoverImageButton* optionsButton_;
48 scoped_ptr<NotificationOptionsMenuModel> menuModel_; 48 scoped_ptr<NotificationOptionsMenuModel> menuModel_;
49 scoped_nsobject<MenuController> menuController_; 49 base::scoped_nsobject<MenuController> menuController_;
50 50
51 // The host for the renderer of the HTML contents. 51 // The host for the renderer of the HTML contents.
52 scoped_ptr<BalloonViewHost> htmlContents_; 52 scoped_ptr<BalloonViewHost> htmlContents_;
53 53
54 // Variables to delay close requested by script while showing modal menu. 54 // Variables to delay close requested by script while showing modal menu.
55 BOOL optionMenuIsActive_; 55 BOOL optionMenuIsActive_;
56 BOOL delayedClose_; 56 BOOL delayedClose_;
57 } 57 }
58 58
59 // Initialize with a balloon object containing the notification data. 59 // Initialize with a balloon object containing the notification data.
(...skipping 25 matching lines...) Expand all
85 85
86 // The BalloonHost 86 // The BalloonHost
87 - (BalloonViewHost*)getHost; 87 - (BalloonViewHost*)getHost;
88 @end 88 @end
89 89
90 @interface BalloonController (UnitTesting) 90 @interface BalloonController (UnitTesting)
91 - (void)initializeHost; 91 - (void)initializeHost;
92 @end 92 @end
93 93
94 #endif // CHROME_BROWSER_UI_COCOA_NOTIFICATIONS_BALLOON_CONTROLLER_H_ 94 #endif // CHROME_BROWSER_UI_COCOA_NOTIFICATIONS_BALLOON_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698