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

Unified Diff: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc

Issue 838033006: Fix the issue that When hiding a window will change its transient child windows' property. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add unit tests. Created 5 years, 11 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 | « no previous file | ui/wm/core/focus_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
index 5b58d47927d462095e6736371215358af5180a44..ddec600e89b694966d61194f37cc5295fa14459d 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
@@ -26,6 +26,7 @@
#include "ui/aura/client/aura_constants.h"
#include "ui/aura/window_event_dispatcher.h"
#include "ui/base/ui_base_types.h"
+#include "ui/wm/core/window_modality_controller.h"
#include "ui/wm/core/window_util.h"
#include "ui/wm/public/activation_client.h"
@@ -1121,5 +1122,55 @@ TEST_F(MultiUserWindowManagerChromeOSTest, TestBlackBarCover) {
EXPECT_EQ(0, window_observer.resize_calls());
}
+// Test that switching between different user won't change the activated windows
+// and the property of transient windows.
Mr4D (OOO till 08-26) 2015/01/20 19:17:22 Thanks for writing the test! Since we have some s
sky 2015/02/18 23:14:20 I would have preferred a test in focus_controller_
+TEST_F(MultiUserWindowManagerChromeOSTest, TransientWindowActivationTest) {
+ SetUpForThisManyWindows(3);
+
+ // Create a window hierarchy like this:
+ // 0 (A) - The normal windows
+ // |
+ // 1 - Transient child of the normal windows.
+ // |
+ // 2 - A transient child of a transient child.
+
+ multi_user_window_manager()->SetWindowOwner(window(0), "A");
+
+ ::wm::AddTransientChild(window(0), window(1));
+ window(1)->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_WINDOW);
+
+ ::wm::AddTransientChild(window(1), window(2));
+ window(2)->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_WINDOW);
+
+ aura::client::ActivationClient* activation_client =
+ aura::client::GetActivationClient(window(0)->GetRootWindow());
+
+ // Activate window #0 will activate its deepest transient child window #2.
+ activation_client->ActivateWindow(window(0));
+ EXPECT_EQ(window(2), activation_client->GetActiveWindow());
+ EXPECT_FALSE(::wm::CanActivateWindow(window(0)));
+ EXPECT_FALSE(::wm::CanActivateWindow(window(1)));
+
+ // Change active user to User B.
+ multi_user_window_manager()->ActiveUserChanged("B");
+
+ // Change active user back to User A.
+ multi_user_window_manager()->ActiveUserChanged("A");
+ EXPECT_EQ(window(2), activation_client->GetActiveWindow());
+ EXPECT_FALSE(::wm::CanActivateWindow(window(0)));
+ EXPECT_FALSE(::wm::CanActivateWindow(window(1)));
+
+ // Test that switching user doesn't change the property of the windows.
+ EXPECT_EQ(ui::MODAL_TYPE_NONE,
+ window(0)->GetProperty(aura::client::kModalKey));
+ EXPECT_EQ(ui::MODAL_TYPE_WINDOW,
+ window(1)->GetProperty(aura::client::kModalKey));
+ EXPECT_EQ(ui::MODAL_TYPE_WINDOW,
+ window(2)->GetProperty(aura::client::kModalKey));
+
+ ::wm::RemoveTransientChild(window(0), window(1));
+ ::wm::RemoveTransientChild(window(1), window(2));
+}
+
} // namespace test
} // namespace ash
« no previous file with comments | « no previous file | ui/wm/core/focus_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698