| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 #include "ui/message_center/views/notification_view.h" | 5 #include "ui/message_center/views/notification_view.h" |
| 6 | 6 |
| 7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "testing/gtest/include/gtest/gtest.h" | 9 #include "testing/gtest/include/gtest/gtest.h" |
| 10 #include "third_party/skia/include/core/SkBitmap.h" | 10 #include "third_party/skia/include/core/SkBitmap.h" |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 155 bool by_user) { | 155 bool by_user) { |
| 156 // For this test, this method should not be invoked. | 156 // For this test, this method should not be invoked. |
| 157 NOTREACHED(); | 157 NOTREACHED(); |
| 158 } | 158 } |
| 159 | 159 |
| 160 scoped_ptr<ui::MenuModel> NotificationViewTest::CreateMenuModel( | 160 scoped_ptr<ui::MenuModel> NotificationViewTest::CreateMenuModel( |
| 161 const NotifierId& notifier_id, | 161 const NotifierId& notifier_id, |
| 162 const base::string16& display_source) { | 162 const base::string16& display_source) { |
| 163 // For this test, this method should not be invoked. | 163 // For this test, this method should not be invoked. |
| 164 NOTREACHED(); | 164 NOTREACHED(); |
| 165 return scoped_ptr<ui::MenuModel>(); | 165 return nullptr; |
| 166 } | 166 } |
| 167 | 167 |
| 168 bool NotificationViewTest::HasClickedListener( | 168 bool NotificationViewTest::HasClickedListener( |
| 169 const std::string& notification_id) { | 169 const std::string& notification_id) { |
| 170 return true; | 170 return true; |
| 171 } | 171 } |
| 172 | 172 |
| 173 void NotificationViewTest::ClickOnNotificationButton( | 173 void NotificationViewTest::ClickOnNotificationButton( |
| 174 const std::string& notification_id, | 174 const std::string& notification_id, |
| 175 int button_index) { | 175 int button_index) { |
| (...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 323 | 323 |
| 324 // Double-check that vertical order is correct. | 324 // Double-check that vertical order is correct. |
| 325 CheckVerticalOrderInNotification(); | 325 CheckVerticalOrderInNotification(); |
| 326 | 326 |
| 327 // Tests that views remain in that order even after an update. | 327 // Tests that views remain in that order even after an update. |
| 328 UpdateNotificationViews(); | 328 UpdateNotificationViews(); |
| 329 CheckVerticalOrderInNotification(); | 329 CheckVerticalOrderInNotification(); |
| 330 } | 330 } |
| 331 | 331 |
| 332 } // namespace message_center | 332 } // namespace message_center |
| OLD | NEW |