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

Unified Diff: chrome/browser/chromeos/file_manager/file_manager_browsertest.cc

Issue 145813010: Files.app: add test for multi-profile desktop movement menu. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase + review fix Created 6 years, 10 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 | chrome/browser/resources/file_manager/background/js/test_util.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
index 4851589e77c19d8ad5c14c46b4594bc73aee17bf..d3a3ec505eb86ed339784f51b904cdd08f862295 100644
--- a/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
+++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest.cc
@@ -11,6 +11,8 @@
#include <deque>
#include <string>
+#include "apps/shell_window.h"
+#include "apps/shell_window_registry.h"
#include "base/bind.h"
#include "base/callback.h"
#include "base/file_util.h"
@@ -27,6 +29,7 @@
#include "chrome/browser/chromeos/drive/drive_integration_service.h"
#include "chrome/browser/chromeos/drive/file_system_interface.h"
#include "chrome/browser/chromeos/drive/test_util.h"
+#include "chrome/browser/chromeos/file_manager/app_id.h"
#include "chrome/browser/chromeos/file_manager/drive_test_util.h"
#include "chrome/browser/chromeos/file_manager/path_util.h"
#include "chrome/browser/chromeos/file_manager/volume_manager.h"
@@ -39,6 +42,8 @@
#include "chrome/browser/extensions/extension_test_message_listener.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
+#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/pref_names.h"
#include "chromeos/chromeos_switches.h"
@@ -846,7 +851,7 @@ class MultiProfileFileManagerBrowserTest : public FileManagerBrowserTestBase {
}
// Loads all users to the current session and sets up necessary fields.
- // This is used for preparing all acounts in PRE_ test setup, and for testing
+ // This is used for preparing all accounts in PRE_ test setup, and for testing
// actual login behavior.
void AddAllUsers() {
for (size_t i = 0; i < arraysize(kTestAccounts); ++i)
@@ -888,6 +893,20 @@ class MultiProfileFileManagerBrowserTest : public FileManagerBrowserTestBase {
if (name == "addAllUsers") {
AddAllUsers();
return "true";
+ } else if (name == "getWindowOwnerId") {
+ chrome::MultiUserWindowManager* const window_manager =
+ chrome::MultiUserWindowManager::GetInstance();
+ apps::ShellWindowRegistry* const shell_window_registry =
+ apps::ShellWindowRegistry::Get(profile());
+ DCHECK(window_manager);
+ DCHECK(shell_window_registry);
+
+ const apps::ShellWindowRegistry::ShellWindowList& list =
+ shell_window_registry->GetShellWindowsForApp(
+ file_manager::kFileManagerAppId);
+ return list.size() == 1u ?
+ window_manager->GetUserPresentingWindow(
+ list.front()->GetNativeWindow()) : "";
}
return FileManagerBrowserTestBase::OnMessage(name, value);
}
@@ -928,6 +947,16 @@ IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, Badge) {
StartTest();
}
+IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest,
+ PRE_VisitDesktopMenu) {
+ AddAllUsers();
+}
+
+IN_PROC_BROWSER_TEST_F(MultiProfileFileManagerBrowserTest, VisitDesktopMenu) {
+ set_test_case_name("multiProfileVisitDesktopMenu");
+ StartTest();
+}
+
// TODO(kinaba) write more tests.
} // namespace
« no previous file with comments | « no previous file | chrome/browser/resources/file_manager/background/js/test_util.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698