summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
authortnagel@chromium.org <tnagel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-05 16:53:54 +0000
committertnagel@chromium.org <tnagel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-05 16:53:54 +0000
commit09ca6472cc00f497246f384e0b0044910dad110f (patch)
treec88272804d956c2aeef98322dcaab2bb2e4ff0b4 /ash
parent7e0a64f05557fc010f906075a6fe6f63c13f1a4c (diff)
downloadchromium_src-09ca6472cc00f497246f384e0b0044910dad110f.zip
chromium_src-09ca6472cc00f497246f384e0b0044910dad110f.tar.gz
chromium_src-09ca6472cc00f497246f384e0b0044910dad110f.tar.bz2
There are many ways to get it wrong.
BUG=none TBR=darin (for base/) TBR=sky (for chrome/ and ui/) TBR=dconnelly (for components/policy/) TBR=tommi (for media/audio/) TBR=asvitkine (for tools/metrics/) TBR=mad (for win8) Review URL: https://codereview.chromium.org/261293002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268203 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
-rw-r--r--ash/system/tray/system_tray_unittest.cc2
-rw-r--r--ash/system/web_notification/web_notification_tray_unittest.cc8
2 files changed, 5 insertions, 5 deletions
diff --git a/ash/system/tray/system_tray_unittest.cc b/ash/system/tray/system_tray_unittest.cc
index 1a2d355..fbf2859 100644
--- a/ash/system/tray/system_tray_unittest.cc
+++ b/ash/system/tray/system_tray_unittest.cc
@@ -312,7 +312,7 @@ TEST_F(SystemTrayTest, SystemTrayNotifications) {
RunAllPendingInMessageLoop();
ASSERT_TRUE(test_item->notification_view() != NULL);
- // Show the detailed view, ensure the notificaiton view remains.
+ // Show the detailed view, ensure the notification view remains.
tray->ShowDetailedView(detailed_item, 0, false, BUBBLE_CREATE_NEW);
RunAllPendingInMessageLoop();
ASSERT_TRUE(detailed_item->detailed_view() != NULL);
diff --git a/ash/system/web_notification/web_notification_tray_unittest.cc b/ash/system/web_notification/web_notification_tray_unittest.cc
index d39d3c9..eaf9d06 100644
--- a/ash/system/web_notification/web_notification_tray_unittest.cc
+++ b/ash/system/web_notification/web_notification_tray_unittest.cc
@@ -332,11 +332,11 @@ TEST_F(WebNotificationTrayTest, MAYBE_PopupAndSystemTray) {
// even more, but still visible.
GetSystemTray()->ShowNotificationView(test_item);
EXPECT_TRUE(GetTray()->IsPopupVisible());
- gfx::Rect work_area_with_tray_notificaiton = GetPopupWorkArea();
+ gfx::Rect work_area_with_tray_notification = GetPopupWorkArea();
EXPECT_GT(work_area.size().GetArea(),
- work_area_with_tray_notificaiton.size().GetArea());
+ work_area_with_tray_notification.size().GetArea());
EXPECT_GT(work_area_with_tray.size().GetArea(),
- work_area_with_tray_notificaiton.size().GetArea());
+ work_area_with_tray_notification.size().GetArea());
// Close system tray, only system tray notifications.
GetSystemTray()->ClickedOutsideBubble();
@@ -344,7 +344,7 @@ TEST_F(WebNotificationTrayTest, MAYBE_PopupAndSystemTray) {
gfx::Rect work_area_with_notification = GetPopupWorkArea();
EXPECT_GT(work_area.size().GetArea(),
work_area_with_notification.size().GetArea());
- EXPECT_LT(work_area_with_tray_notificaiton.size().GetArea(),
+ EXPECT_LT(work_area_with_tray_notification.size().GetArea(),
work_area_with_notification.size().GetArea());
// Close the system tray notifications.