mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update for move of scoped_nsobject header and namespace

Browse source 
See http://src.chromium.org/viewvc/chrome?view=revision&revision=207616.
This commit is contained in:
Adam Roben 2013-10-07 15:17:39 -04:00
parent 1e99ec9aed
commit 64a5ce6e15
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
brightray/browser/inspectable_web_contents_view_mac.h
View file

@ -3,7 +3,7 @@
#import "browser/inspectable_web_contents_view.h" #import "browser/inspectable_web_contents_view.h"
#import "base/memory/scoped_nsobject.h" #import "base/mac/scoped_nsobject.h"
@class BRYInspectableWebContentsView; @class BRYInspectableWebContentsView;
@ -26,7 +26,7 @@ private:
// Owns us. // Owns us.
InspectableWebContentsImpl* inspectable_web_contents_; InspectableWebContentsImpl* inspectable_web_contents_;
scoped_nsobject<BRYInspectableWebContentsView> view_; base::scoped_nsobject<BRYInspectableWebContentsView> view_;
DISALLOW_COPY_AND_ASSIGN(InspectableWebContentsViewMac); DISALLOW_COPY_AND_ASSIGN(InspectableWebContentsViewMac);
}; };

6
brightray/browser/notification_presenter_mac.h
View file

@ -8,7 +8,7 @@
#import "browser/notification_presenter.h" #import "browser/notification_presenter.h"
#import "base/memory/scoped_nsobject.h" #import "base/mac/scoped_nsobject.h"
#import <map> #import <map>
@class BRYUserNotificationCenterDelegate; @class BRYUserNotificationCenterDelegate;
@ -30,8 +30,8 @@ class NotificationPresenterMac : public NotificationPresenter {
int notification_id) OVERRIDE; int notification_id) OVERRIDE;
private: private:
std::map<std::string, scoped_nsobject<NSUserNotification>> notification_map_; std::map<std::string, base::scoped_nsobject<NSUserNotification>> notification_map_;
scoped_nsobject<BRYUserNotificationCenterDelegate> delegate_; base::scoped_nsobject<BRYUserNotificationCenterDelegate> delegate_;
}; };
} }

4
brightray/browser/notification_presenter_mac.mm
View file

@ -56,7 +56,7 @@ struct NotificationID {
int notification_id; int notification_id;
}; };
scoped_nsobject<NSUserNotification> CreateUserNotification( base::scoped_nsobject<NSUserNotification> CreateUserNotification(
const content::ShowDesktopNotificationHostMsgParams& params, const content::ShowDesktopNotificationHostMsgParams& params,
int render_process_id, int render_process_id,
int render_view_id) { int render_view_id) {
@ -65,7 +65,7 @@ scoped_nsobject<NSUserNotification> CreateUserNotification(
notification.informativeText = base::SysUTF16ToNSString(params.body); notification.informativeText = base::SysUTF16ToNSString(params.body);
notification.userInfo = NotificationID(render_process_id, render_view_id, params.notification_id).GetUserInfo(); notification.userInfo = NotificationID(render_process_id, render_view_id, params.notification_id).GetUserInfo();
return scoped_nsobject<NSUserNotification>(notification); return base::scoped_nsobject<NSUserNotification>(notification);
} }
} }