| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 #import "ui/message_center/cocoa/popup_collection.h" | 5 #import "ui/message_center/cocoa/popup_collection.h" |
| 6 | 6 |
| 7 #include "base/mac/scoped_nsobject.h" | 7 #include "base/mac/scoped_nsobject.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/run_loop.h" | 10 #include "base/run_loop.h" |
| 11 #include "base/strings/sys_string_conversions.h" | 11 #include "base/strings/sys_string_conversions.h" |
| 12 #include "base/strings/utf_string_conversions.h" | 12 #include "base/strings/utf_string_conversions.h" |
| 13 #import "ui/base/test/ui_cocoa_test_helper.h" | 13 #import "ui/base/test/ui_cocoa_test_helper.h" |
| 14 #import "ui/message_center/cocoa/notification_controller.h" | 14 #import "ui/message_center/cocoa/notification_controller.h" |
| 15 #import "ui/message_center/cocoa/popup_controller.h" | 15 #import "ui/message_center/cocoa/popup_controller.h" |
| 16 #include "ui/message_center/message_center.h" | 16 #include "ui/message_center/message_center.h" |
| 17 #include "ui/message_center/message_center_style.h" | 17 #include "ui/message_center/message_center_style.h" |
| 18 #include "ui/message_center/notification.h" | 18 #include "ui/message_center/notification.h" |
| 19 | 19 |
| (...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 351 string16(), | 351 string16(), |
| 352 std::string(), | 352 std::string(), |
| 353 message_center::RichNotificationData(), | 353 message_center::RichNotificationData(), |
| 354 NULL)); | 354 NULL)); |
| 355 center_->UpdateNotification("1", notification.Pass()); | 355 center_->UpdateNotification("1", notification.Pass()); |
| 356 | 356 |
| 357 // Release the popup collection before the animation ends. No crash should | 357 // Release the popup collection before the animation ends. No crash should |
| 358 // be expected. | 358 // be expected. |
| 359 collection_.reset(); | 359 collection_.reset(); |
| 360 } | 360 } |
| OLD | NEW |