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

Unified Diff: chrome/browser/extensions/extension_crash_recovery_browsertest.cc

Issue 231213003: notification balloons: Remove views and cocoa implementations of BalloonCollection. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 8 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
« no previous file with comments | « chrome/app/nibs/Notification.xib ('k') | chrome/browser/notifications/balloon_collection_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_crash_recovery_browsertest.cc
diff --git a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc
index 29d8f84485173c2ba2688a7cf06cf1393d8fb083..c92f1496c8fd8c12e717068f6b1f01cd48943067 100644
--- a/chrome/browser/extensions/extension_crash_recovery_browsertest.cc
+++ b/chrome/browser/extensions/extension_crash_recovery_browsertest.cc
@@ -147,7 +147,7 @@ class MAYBE_ExtensionCrashRecoveryTest
it++;
std::string id = (*it)->id();
message_center->ClickOnNotification(id);
-#if !defined(OS_CHROMEOS)
+#if defined(TOOLKIT_GTK)
} else {
Balloon* balloon = GetNotificationDelegate(index);
ASSERT_TRUE(balloon);
@@ -167,7 +167,7 @@ class MAYBE_ExtensionCrashRecoveryTest
for (size_t i=0; i < index; i++) { it++; }
ASSERT_TRUE(g_browser_process->notification_ui_manager()->
CancelById((*it)->id()));
-#if !defined(OS_CHROMEOS)
+#if defined(TOOLKIT_GTK)
} else {
Balloon* balloon = GetNotificationDelegate(index);
ASSERT_TRUE(balloon);
@@ -181,17 +181,17 @@ class MAYBE_ExtensionCrashRecoveryTest
if (message_center::IsRichNotificationEnabled())
return message_center::MessageCenter::Get()->NotificationCount();
-#if defined(OS_CHROMEOS)
- CHECK(false);
- return 0;
-#else
+#if defined(TOOLKIT_GTK)
return BalloonNotificationUIManager::GetInstanceForTesting()->
balloon_collection()->GetActiveBalloons().size();
+#else
+ CHECK(false);
+ return 0;
#endif
}
private:
-#if !defined(OS_CHROMEOS)
+#if defined(TOOLKIT_GTK)
Balloon* GetNotificationDelegate(size_t index) {
BalloonNotificationUIManager* manager =
BalloonNotificationUIManager::GetInstanceForTesting();
« no previous file with comments | « chrome/app/nibs/Notification.xib ('k') | chrome/browser/notifications/balloon_collection_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698