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

Side by Side Diff: chrome/browser/ui/cocoa/status_icons/status_icon_mac.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, 5 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_STATUS_ICONS_STATUS_ICON_MAC_H_ 5 #ifndef CHROME_BROWSER_UI_COCOA_STATUS_ICONS_STATUS_ICON_MAC_H_
6 #define CHROME_BROWSER_UI_COCOA_STATUS_ICONS_STATUS_ICON_MAC_H_ 6 #define CHROME_BROWSER_UI_COCOA_STATUS_ICONS_STATUS_ICON_MAC_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/gtest_prod_util.h" 11 #include "base/gtest_prod_util.h"
12 #include "base/memory/scoped_nsobject.h" 12 #include "base/mac/scoped_nsobject.h"
13 #include "base/strings/string16.h" 13 #include "base/strings/string16.h"
14 #include "chrome/browser/status_icons/desktop_notification_balloon.h" 14 #include "chrome/browser/status_icons/desktop_notification_balloon.h"
15 #include "chrome/browser/status_icons/status_icon.h" 15 #include "chrome/browser/status_icons/status_icon.h"
16 16
17 @class MenuController; 17 @class MenuController;
18 @class NSStatusItem; 18 @class NSStatusItem;
19 @class StatusItemController; 19 @class StatusItemController;
20 20
21 class StatusIconMac : public StatusIcon { 21 class StatusIconMac : public StatusIcon {
22 public: 22 public:
(...skipping 16 matching lines...) Expand all
39 39
40 private: 40 private:
41 FRIEND_TEST_ALL_PREFIXES(StatusIconMacTest, CreateMenu); 41 FRIEND_TEST_ALL_PREFIXES(StatusIconMacTest, CreateMenu);
42 FRIEND_TEST_ALL_PREFIXES(StatusIconMacTest, MenuToolTip); 42 FRIEND_TEST_ALL_PREFIXES(StatusIconMacTest, MenuToolTip);
43 43
44 void SetToolTip(NSString* toolTip); 44 void SetToolTip(NSString* toolTip);
45 void CreateMenu(ui::MenuModel* model, NSString* toolTip); 45 void CreateMenu(ui::MenuModel* model, NSString* toolTip);
46 46
47 // Getter for item_ that allows lazy initialization. 47 // Getter for item_ that allows lazy initialization.
48 NSStatusItem* item(); 48 NSStatusItem* item();
49 scoped_nsobject<NSStatusItem> item_; 49 base::scoped_nsobject<NSStatusItem> item_;
50 50
51 scoped_nsobject<StatusItemController> controller_; 51 base::scoped_nsobject<StatusItemController> controller_;
52 52
53 // Notification balloon. 53 // Notification balloon.
54 DesktopNotificationBalloon notification_; 54 DesktopNotificationBalloon notification_;
55 55
56 scoped_nsobject<NSString> toolTip_; 56 base::scoped_nsobject<NSString> toolTip_;
57 57
58 // Status menu shown when right-clicking the system icon, if it has been 58 // Status menu shown when right-clicking the system icon, if it has been
59 // created by |UpdatePlatformContextMenu|. 59 // created by |UpdatePlatformContextMenu|.
60 scoped_nsobject<MenuController> menu_; 60 base::scoped_nsobject<MenuController> menu_;
61 61
62 DISALLOW_COPY_AND_ASSIGN(StatusIconMac); 62 DISALLOW_COPY_AND_ASSIGN(StatusIconMac);
63 }; 63 };
64 64
65 #endif // CHROME_BROWSER_UI_COCOA_STATUS_ICONS_STATUS_ICON_MAC_H_ 65 #endif // CHROME_BROWSER_UI_COCOA_STATUS_ICONS_STATUS_ICON_MAC_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698