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

Side by Side Diff: chrome/browser/ui/cocoa/location_bar/action_box_menu_bubble_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_LOCATION_BAR_ACTION_BOX_MENU_BUBBLE_CONTROLLER_H _ 5 #ifndef CHROME_BROWSER_UI_COCOA_LOCATION_BAR_ACTION_BOX_MENU_BUBBLE_CONTROLLER_H _
6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_ACTION_BOX_MENU_BUBBLE_CONTROLLER_H _ 6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_ACTION_BOX_MENU_BUBBLE_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 #import "chrome/browser/ui/cocoa/base_bubble_controller.h" 12 #import "chrome/browser/ui/cocoa/base_bubble_controller.h"
13 #import "ui/base/cocoa/tracking_area.h" 13 #import "ui/base/cocoa/tracking_area.h"
14 14
15 class ActionBoxMenuModel; 15 class ActionBoxMenuModel;
16 class ExtensionIconLoaderBridge; 16 class ExtensionIconLoaderBridge;
17 class Profile; 17 class Profile;
18 18
19 // This window controller manages the action box popup menu. 19 // This window controller manages the action box popup menu.
20 @interface ActionBoxMenuBubbleController : BaseBubbleController { 20 @interface ActionBoxMenuBubbleController : BaseBubbleController {
21 @private 21 @private
22 Profile* profile_; 22 Profile* profile_;
23 23
24 // The model that contains the data from the backend. 24 // The model that contains the data from the backend.
25 scoped_ptr<ActionBoxMenuModel> model_; 25 scoped_ptr<ActionBoxMenuModel> model_;
26 26
27 // Array of the below view controllers. 27 // Array of the below view controllers.
28 scoped_nsobject<NSMutableArray> items_; 28 base::scoped_nsobject<NSMutableArray> items_;
29 } 29 }
30 30
31 // Designated initializer. |point| must be in screen coordinates. 31 // Designated initializer. |point| must be in screen coordinates.
32 - (id)initWithModel:(scoped_ptr<ActionBoxMenuModel>)model 32 - (id)initWithModel:(scoped_ptr<ActionBoxMenuModel>)model
33 parentWindow:(NSWindow*)parent 33 parentWindow:(NSWindow*)parent
34 anchoredAt:(NSPoint)point 34 anchoredAt:(NSPoint)point
35 profile:(Profile*)profile; 35 profile:(Profile*)profile;
36 36
37 // Accesses the model. 37 // Accesses the model.
38 - (ActionBoxMenuModel*)model; 38 - (ActionBoxMenuModel*)model;
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 98
99 // Used to highlight the background on hover. 99 // Used to highlight the background on hover.
100 ui::ScopedCrTrackingArea trackingArea_; 100 ui::ScopedCrTrackingArea trackingArea_;
101 } 101 }
102 102
103 @property(assign, nonatomic) ActionBoxMenuItemController* viewController; 103 @property(assign, nonatomic) ActionBoxMenuItemController* viewController;
104 104
105 @end 105 @end
106 106
107 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_ACTION_BOX_MENU_BUBBLE_CONTROLLE R_H_ 107 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_ACTION_BOX_MENU_BUBBLE_CONTROLLE R_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698