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

Unified Diff: chrome/browser/notifications/notification_interactive_uitest_mac.mm

Issue 2729613006: When navigation focuses a web contents, also activate its window. (Closed)
Patch Set: Copyright + nits Created 3 years, 9 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
Index: chrome/browser/notifications/notification_interactive_uitest_mac.mm
diff --git a/chrome/browser/notifications/notification_interactive_uitest_mac.mm b/chrome/browser/notifications/notification_interactive_uitest_mac.mm
new file mode 100644
index 0000000000000000000000000000000000000000..9a648aef1091672f241c675df16b71ebbc689d36
--- /dev/null
+++ b/chrome/browser/notifications/notification_interactive_uitest_mac.mm
@@ -0,0 +1,53 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#import <AppKit/AppKit.h>
+
+#include "chrome/browser/notifications/notification_interactive_uitest_support.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_window.h"
+#include "chrome/test/base/interactive_test_utils.h"
+#import "ui/base/test/windowed_nsnotification_observer.h"
+#include "ui/message_center/message_center.h"
+
+// Verify that Chrome becomes the active app if a notification opens a popup
+// when clicked.
+IN_PROC_BROWSER_TEST_F(NotificationsTest, TestPopupShouldActivateApp) {
+ EXPECT_TRUE(embedded_test_server()->Start());
+
+ AllowAllOrigins();
+ ui_test_utils::NavigateToURL(browser(), GetTestPageURL());
+
+ EXPECT_TRUE(ui_test_utils::ShowAndFocusNativeWindow(
+ browser()->window()->GetNativeWindow()));
+
+ {
+ base::scoped_nsobject<WindowedNSNotificationObserver> observer(
+ [[WindowedNSNotificationObserver alloc]
+ initForNotification:NSApplicationDidResignActiveNotification
+ object:NSApp]);
+ [NSApp hide:nil];
+ [observer wait];
+ }
+ EXPECT_FALSE([NSApp isActive]);
+
+ std::string result = CreateNotification(
+ browser(), true, "", "", "", "",
+ "window.open('', '', 'width=100,height=100').focus();");
+ EXPECT_NE("-1", result);
+
+ auto* message_center = message_center::MessageCenter::Get();
+ message_center::Notification* notification =
+ *message_center->GetVisibleNotifications().begin();
+
+ {
+ base::scoped_nsobject<WindowedNSNotificationObserver> observer(
+ [[WindowedNSNotificationObserver alloc]
+ initForNotification:NSApplicationDidBecomeActiveNotification
+ object:NSApp]);
+ message_center->ClickOnNotification(notification->id());
+ [observer wait];
+ }
+ EXPECT_TRUE([NSApp isActive]);
+}

Powered by Google App Engine
This is Rietveld 408576698