Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(752)

Side by Side Diff: ui/message_center/views/message_center_view_unittest.cc

Issue 2850153003: Revert of CrOS: Fix appearance of notification toasts when sliding out via gesture (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 #include "ui/message_center/views/message_center_view.h" 5 #include "ui/message_center/views/message_center_view.h"
6 6
7 #include <map> 7 #include <map>
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 10
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/ptr_util.h" 13 #include "base/memory/ptr_util.h"
14 #include "base/run_loop.h" 14 #include "base/run_loop.h"
15 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
17 #include "ui/message_center/fake_message_center.h" 17 #include "ui/message_center/fake_message_center.h"
18 #include "ui/message_center/message_center_style.h" 18 #include "ui/message_center/message_center_style.h"
19 #include "ui/message_center/notification.h" 19 #include "ui/message_center/notification.h"
20 #include "ui/message_center/notification_list.h" 20 #include "ui/message_center/notification_list.h"
21 #include "ui/message_center/notification_types.h" 21 #include "ui/message_center/notification_types.h"
22 #include "ui/message_center/views/message_center_button_bar.h" 22 #include "ui/message_center/views/message_center_button_bar.h"
23 #include "ui/message_center/views/message_center_controller.h" 23 #include "ui/message_center/views/message_center_controller.h"
24 #include "ui/message_center/views/message_list_view.h" 24 #include "ui/message_center/views/message_list_view.h"
25 #include "ui/message_center/views/notification_view.h" 25 #include "ui/message_center/views/notification_view.h"
26 #include "ui/views/controls/slide_out_view.h"
26 #include "ui/views/test/views_test_base.h" 27 #include "ui/views/test/views_test_base.h"
27 28
28 namespace message_center { 29 namespace message_center {
29 30
30 static const char* kNotificationId1 = "notification id 1"; 31 static const char* kNotificationId1 = "notification id 1";
31 static const char* kNotificationId2 = "notification id 2"; 32 static const char* kNotificationId2 = "notification id 2";
32 33
33 /* Types **********************************************************************/ 34 /* Types **********************************************************************/
34 35
35 enum CallType { 36 enum CallType {
(...skipping 908 matching lines...) Expand 10 before | Expand all | Expand 10 after
944 base::UTF8ToUTF16("title1"), base::UTF8ToUTF16("message"), gfx::Image(), 945 base::UTF8ToUTF16("title1"), base::UTF8ToUTF16("message"), gfx::Image(),
945 base::UTF8ToUTF16("display source"), GURL(), 946 base::UTF8ToUTF16("display source"), GURL(),
946 NotifierId(NotifierId::APPLICATION, "extension_id"), 947 NotifierId(NotifierId::APPLICATION, "extension_id"),
947 message_center::RichNotificationData(), nullptr)); 948 message_center::RichNotificationData(), nullptr));
948 949
949 GetMessageCenterView()->SizeToPreferredSize(); 950 GetMessageCenterView()->SizeToPreferredSize();
950 EXPECT_NE(kEmptyMessageCenterViewHeight, GetMessageCenterView()->height()); 951 EXPECT_NE(kEmptyMessageCenterViewHeight, GetMessageCenterView()->height());
951 } 952 }
952 953
953 } // namespace message_center 954 } // namespace message_center
OLDNEW
« no previous file with comments | « ui/message_center/views/custom_notification_view_unittest.cc ('k') | ui/message_center/views/message_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698