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

Side by Side Diff: chrome/browser/ui/cocoa/infobars/extension_infobar_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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_EXTENSION_INFOBAR_CONTROLLER_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_INFOBARS_EXTENSION_INFOBAR_CONTROLLER_H_
6 #define CHROME_BROWSER_UI_COCOA_INFOBARS_EXTENSION_INFOBAR_CONTROLLER_H_ 6 #define CHROME_BROWSER_UI_COCOA_INFOBARS_EXTENSION_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 <Cocoa/Cocoa.h> 10 #import <Cocoa/Cocoa.h>
11 11
12 #import "base/memory/scoped_nsobject.h" 12 #import "base/mac/scoped_nsobject.h"
13 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
14 14
15 @class ExtensionActionContextMenu; 15 @class ExtensionActionContextMenu;
16 class InfobarBridge; 16 class InfobarBridge;
17 @class MenuButton; 17 @class MenuButton;
18 18
19 @interface ExtensionInfoBarController : InfoBarController { 19 @interface ExtensionInfoBarController : InfoBarController {
20 // The native extension view retrieved from the extension host. Weak. 20 // The native extension view retrieved from the extension host. Weak.
21 NSView* extensionView_; 21 NSView* extensionView_;
22 22
23 // The window containing this InfoBar. Weak. 23 // The window containing this InfoBar. Weak.
24 NSWindow* window_; 24 NSWindow* window_;
25 25
26 // The InfoBar's button with the Extension's icon that launches the context 26 // The InfoBar's button with the Extension's icon that launches the context
27 // menu. 27 // menu.
28 scoped_nsobject<MenuButton> dropdownButton_; 28 base::scoped_nsobject<MenuButton> dropdownButton_;
29 29
30 // The context menu that pops up when the left button is clicked. 30 // The context menu that pops up when the left button is clicked.
31 scoped_nsobject<ExtensionActionContextMenu> contextMenu_; 31 base::scoped_nsobject<ExtensionActionContextMenu> contextMenu_;
32 32
33 // Helper class to bridge C++ and ObjC functionality together for the infobar. 33 // Helper class to bridge C++ and ObjC functionality together for the infobar.
34 scoped_ptr<InfobarBridge> bridge_; 34 scoped_ptr<InfobarBridge> bridge_;
35 } 35 }
36 36
37 @end 37 @end
38 38
39 #endif // CHROME_BROWSER_UI_COCOA_INFOBARS_EXTENSION_INFOBAR_CONTROLLER_H_ 39 #endif // CHROME_BROWSER_UI_COCOA_INFOBARS_EXTENSION_INFOBAR_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698