ui/message_center/message_center_tray_unittest.cc - Issue 12277024: Notificaitons refactor step 2

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/message_center/message_center_tray_unittest.cc

Issue 12277024: Notificaitons refactor step 2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: steven's feedback Created 7 years, 10 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 side-by-side diff with in-line comments

Download patch

« ui/message_center/message_center_bubble.cc ('K') | « ui/message_center/message_center_bubble.cc ('k') | ui/message_center/message_popup_bubble.cc » ('j') | ui/message_center/message_popup_bubble.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/message_center/message_center_tray_unittest.cc

diff --git a/ui/message_center/message_center_tray_unittest.cc b/ui/message_center/message_center_tray_unittest.cc

index e3fa107ec7e7872848dc30acc4b90f5f577eec7c..406e360a93004ab07369b346961706c8b5753566 100644

--- a/ui/message_center/message_center_tray_unittest.cc

+++ b/ui/message_center/message_center_tray_unittest.cc

@@ -7,7 +7,7 @@

#include "base/utf_string_conversions.h"

#include "testing/gtest/include/gtest/gtest.h"

#include "ui/message_center/message_center.h"

-#include "ui/notifications/notification_types.h"

+#include "ui/message_center/notification_types.h"

namespace message_center {

namespace {

@@ -102,7 +102,7 @@ TEST_F(MessageCenterTrayTest, BasicPopup) {

ASSERT_FALSE(message_center_tray_->message_center_visible());

message_center_->AddNotification(

- ui::notifications::NOTIFICATION_TYPE_SIMPLE,

+ message_center::NOTIFICATION_TYPE_SIMPLE,

"BasicPopup",

ASCIIToUTF16("Test Web Notification"),

ASCIIToUTF16("Notification message body."),

@@ -124,7 +124,7 @@ TEST_F(MessageCenterTrayTest, MessageCenterClosesPopups) {

ASSERT_FALSE(message_center_tray_->message_center_visible());

message_center_->AddNotification(

- ui::notifications::NOTIFICATION_TYPE_SIMPLE,

+ message_center::NOTIFICATION_TYPE_SIMPLE,

"MessageCenterClosesPopups",

ASCIIToUTF16("Test Web Notification"),

ASCIIToUTF16("Notification message body."),

@@ -142,7 +142,7 @@ TEST_F(MessageCenterTrayTest, MessageCenterClosesPopups) {

ASSERT_TRUE(message_center_tray_->message_center_visible());

message_center_->AddNotification(

- ui::notifications::NOTIFICATION_TYPE_SIMPLE,

+ message_center::NOTIFICATION_TYPE_SIMPLE,

"MessageCenterClosesPopups2",

ASCIIToUTF16("Test Web Notification"),

ASCIIToUTF16("Notification message body."),

@@ -170,7 +170,7 @@ TEST_F(MessageCenterTrayTest, ShowBubbleFails) {

ASSERT_FALSE(message_center_tray_->message_center_visible());

message_center_->AddNotification(

- ui::notifications::NOTIFICATION_TYPE_SIMPLE,

+ message_center::NOTIFICATION_TYPE_SIMPLE,

"ShowBubbleFails",

ASCIIToUTF16("Test Web Notification"),

ASCIIToUTF16("Notification message body."),