summaryrefslogtreecommitdiffstats
path: root/chrome/browser/notifications
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/notifications')
-rw-r--r--chrome/browser/notifications/balloon_collection_linux.cc5
-rw-r--r--chrome/browser/notifications/desktop_notifications_unittest.cc4
2 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/notifications/balloon_collection_linux.cc b/chrome/browser/notifications/balloon_collection_linux.cc
index d787876..1ad122b 100644
--- a/chrome/browser/notifications/balloon_collection_linux.cc
+++ b/chrome/browser/notifications/balloon_collection_linux.cc
@@ -13,13 +13,8 @@ Balloon* BalloonCollectionImpl::MakeBalloon(const Notification& notification,
Profile* profile) {
Balloon* balloon = new Balloon(notification, profile, this);
- // TODO(johnnyg): hookup to views code for Chrome OS.
-#if defined(TOOLKIT_GTK)
balloon->set_view(new BalloonViewImpl());
gfx::Size size(layout_.min_balloon_width(), layout_.min_balloon_height());
balloon->set_content_size(size);
-#endif
-
return balloon;
-
}
diff --git a/chrome/browser/notifications/desktop_notifications_unittest.cc b/chrome/browser/notifications/desktop_notifications_unittest.cc
index 32bda04..186dd5f 100644
--- a/chrome/browser/notifications/desktop_notifications_unittest.cc
+++ b/chrome/browser/notifications/desktop_notifications_unittest.cc
@@ -163,7 +163,7 @@ TEST_F(DesktopNotificationsTest, TestCancel) {
log_output_);
}
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(TOOLKIT_VIEWS)
TEST_F(DesktopNotificationsTest, TestPositioning) {
std::string expected_log;
// Create some toasts. After each but the first, make sure there
@@ -188,7 +188,6 @@ TEST_F(DesktopNotificationsTest, TestVariableSize) {
std::string expected_log;
// Create some toasts. After each but the first, make sure there
// is a minimum separation between the toasts.
- int last_top = 0;
EXPECT_TRUE(service_->ShowDesktopNotificationText(
GURL("http://long.google.com"), GURL("/icon.png"),
ASCIIToUTF16("Really Really Really Really Really Really "
@@ -303,4 +302,3 @@ TEST_F(DesktopNotificationsTest, TestUserInputEscaping) {
EXPECT_EQ(std::string::npos, data_url.spec().find("<script>"));
EXPECT_EQ(std::string::npos, data_url.spec().find("<i>"));
}
-