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

Unified Diff: athena/activity/activity_manager_unittest.cc

Issue 694353004: athena: Expose the list of activities from the ActivityManager. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 6 years, 1 month 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 | « athena/activity/activity_manager_impl.cc ('k') | athena/activity/public/activity_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/activity/activity_manager_unittest.cc
diff --git a/athena/activity/activity_manager_unittest.cc b/athena/activity/activity_manager_unittest.cc
index 92e721d811c1358b7edc24f14579e7b8fd5d4907..561578e241cb3ac7a90fe4c7dc04ed2f7280ac4f 100644
--- a/athena/activity/activity_manager_unittest.cc
+++ b/athena/activity/activity_manager_unittest.cc
@@ -9,6 +9,7 @@
#include "athena/test/base/athena_test_base.h"
#include "athena/test/base/test_windows.h"
#include "ui/aura/window.h"
+#include "ui/wm/core/window_util.h"
namespace athena {
@@ -58,4 +59,25 @@ TEST_F(ActivityManagerTest, GetActivityForWindow) {
EXPECT_EQ(nullptr, manager->GetActivityForWindow(window.get()));
}
+TEST_F(ActivityManagerTest, ActivationBringsActivityToTop) {
+ ActivityManager* manager = ActivityManager::Get();
+ ActivityFactory* factory = ActivityFactory::Get();
+
+ Activity* activity1 =
+ factory->CreateWebActivity(nullptr, base::string16(), GURL());
+ Activity* activity2 =
+ factory->CreateWebActivity(nullptr, base::string16(), GURL());
+ activity1->GetWindow()->Show();
+ activity2->GetWindow()->Show();
+
+ ASSERT_EQ(2u, manager->GetActivityList().size());
+ EXPECT_EQ(activity2, manager->GetActivityList()[0]);
+ EXPECT_EQ(activity1, manager->GetActivityList()[1]);
+
+ wm::ActivateWindow(activity1->GetWindow());
+ ASSERT_EQ(2u, manager->GetActivityList().size());
+ EXPECT_EQ(activity1, manager->GetActivityList()[0]);
+ EXPECT_EQ(activity2, manager->GetActivityList()[1]);
+}
+
} // namespace athena
« no previous file with comments | « athena/activity/activity_manager_impl.cc ('k') | athena/activity/public/activity_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698