projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 7.36.149.0
[platform/framework/web/crosswalk.git]
/
src
/
ui
/
message_center
/
cocoa
/
tray_view_controller.mm
diff --git
a/src/ui/message_center/cocoa/tray_view_controller.mm
b/src/ui/message_center/cocoa/tray_view_controller.mm
index
2458457
..
6743051
100644
(file)
--- a/
src/ui/message_center/cocoa/tray_view_controller.mm
+++ b/
src/ui/message_center/cocoa/tray_view_controller.mm
@@
-56,7
+56,7
@@
const int kBackButtonSize = 16;
// Step 1: hide all notifications pending removal with fade-out animation.
- (void)hideNotificationsPendingRemoval;
// Step 1: hide all notifications pending removal with fade-out animation.
- (void)hideNotificationsPendingRemoval;
-// Step 2: move up all remaining notfications to take over the available space
+// Step 2: move up all remaining not
i
fications to take over the available space
// due to hiding notifications. The scroll view and the window remain unchanged.
- (void)moveUpRemainingNotifications;
// due to hiding notifications. The scroll view and the window remain unchanged.
- (void)moveUpRemainingNotifications;
@@
-67,7
+67,7
@@
const int kBackButtonSize = 16;
// "Clear All" is clicked.
- (void)clearOneNotification;
// "Clear All" is clicked.
- (void)clearOneNotification;
-// When all visible notificatons slide out, re-enable controls and remove
+// When all visible notificat
i
ons slide out, re-enable controls and remove
// notifications from the message center.
- (void)finalizeClearAll;
// notifications from the message center.
- (void)finalizeClearAll;
@@
-205,7
+205,8
@@
const CGFloat kTrayBottomMargin = 75;
[[scrollView_ documentView] addSubview:[controller view]];
[notifications_ addObject:controller]; // Transfer ownership.
[[scrollView_ documentView] addSubview:[controller view]];
[notifications_ addObject:controller]; // Transfer ownership.
- messageCenter_->DisplayedNotification((*it)->id());
+ messageCenter_->DisplayedNotification(
+ (*it)->id(), message_center::DISPLAY_SOURCE_MESSAGE_CENTER);
notification = controller.get();
} else {
notification = controller.get();
} else {