github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-27 16:28:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

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

6
brightray/browser/notification_presenter_mac.h
View File

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

4
brightray/browser/notification_presenter_mac.mm
View File

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