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

Unified 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, 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/status_icons/status_icon_mac.h
diff --git a/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h b/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h
index 51fa1383ac4eeeb7f98966a6aa8684bdff941067..8b380c4748b93c7c032c42e686f4c1f79f8a13e5 100644
--- a/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h
+++ b/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h
@@ -9,7 +9,7 @@
#include "base/compiler_specific.h"
#include "base/gtest_prod_util.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#include "base/strings/string16.h"
#include "chrome/browser/status_icons/desktop_notification_balloon.h"
#include "chrome/browser/status_icons/status_icon.h"
@@ -46,18 +46,18 @@ class StatusIconMac : public StatusIcon {
// Getter for item_ that allows lazy initialization.
NSStatusItem* item();
- scoped_nsobject<NSStatusItem> item_;
+ base::scoped_nsobject<NSStatusItem> item_;
- scoped_nsobject<StatusItemController> controller_;
+ base::scoped_nsobject<StatusItemController> controller_;
// Notification balloon.
DesktopNotificationBalloon notification_;
- scoped_nsobject<NSString> toolTip_;
+ base::scoped_nsobject<NSString> toolTip_;
// Status menu shown when right-clicking the system icon, if it has been
// created by |UpdatePlatformContextMenu|.
- scoped_nsobject<MenuController> menu_;
+ base::scoped_nsobject<MenuController> menu_;
DISALLOW_COPY_AND_ASSIGN(StatusIconMac);
};

Powered by Google App Engine
This is Rietveld 408576698