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

Unified Diff: chrome/browser/ui/ash/chrome_new_window_delegate_browsertest.cc

Issue 2434463004: mash: Move directly linked NewWindowDelegate to mojom::NewWindowClient. (Closed)
Patch Set: Rebase to ToT Created 4 years, 2 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 | « chrome/browser/ui/ash/chrome_new_window_delegate.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/chrome_new_window_delegate_browsertest.cc
diff --git a/chrome/browser/ui/ash/chrome_new_window_delegate_browsertest.cc b/chrome/browser/ui/ash/chrome_new_window_delegate_browsertest.cc
deleted file mode 100644
index c05daebb4ad8f93c5494e6bff579c8e96965706f..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/ash/chrome_new_window_delegate_browsertest.cc
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2016 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.
-
-#include "ash/common/new_window_delegate.h"
-#include "ash/common/wm_shell.h"
-#include "ash/wm/window_util.h"
-#include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/browser/ui/browser_finder.h"
-#include "chrome/browser/ui/browser_window.h"
-#include "chrome/test/base/in_process_browser_test.h"
-#include "components/signin/core/account_id/account_id.h"
-#include "components/user_manager/user_manager.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "ui/aura/window.h"
-
-namespace {
-
-const char kTestUserName1[] = "test1@test.com";
-const char kTestUserName2[] = "test2@test.com";
-
-} // namespace
-
-typedef InProcessBrowserTest ChromeNewWindowDelegateBrowserTest;
-
-// Tests that when we open a new window by pressing 'Ctrl-N', we should use the
-// current active window's profile to determine on which profile's desktop we
-// should open a new window.
-IN_PROC_BROWSER_TEST_F(ChromeNewWindowDelegateBrowserTest,
- NewWindowForActiveWindowProfileTest) {
- user_manager::UserManager::Get()->UserLoggedIn(
- AccountId::FromUserEmail(kTestUserName1), kTestUserName1, false);
- Profile* profile1 = ProfileManager::GetActiveUserProfile();
- Browser* browser1 = CreateBrowser(profile1);
- // The newly created window should be created for the current active profile.
- ash::WmShell::Get()->new_window_delegate()->NewWindow(false);
- EXPECT_EQ(
- chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow())->profile(),
- profile1);
-
- // Login another user and make sure the current active user changes.
- user_manager::UserManager::Get()->UserLoggedIn(
- AccountId::FromUserEmail(kTestUserName2), kTestUserName2, false);
- Profile* profile2 = ProfileManager::GetActiveUserProfile();
- EXPECT_NE(profile1, profile2);
-
- Browser* browser2 = CreateBrowser(profile2);
- // The newly created window should be created for the current active window's
- // profile, which is |profile2|.
- ash::WmShell::Get()->new_window_delegate()->NewWindow(false);
- EXPECT_EQ(
- chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow())->profile(),
- profile2);
-
- // After activating |browser1|, the newly created window should be created
- // against |browser1|'s profile.
- browser1->window()->Show();
- ash::WmShell::Get()->new_window_delegate()->NewWindow(false);
- EXPECT_EQ(
- chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow())->profile(),
- profile1);
-
- // Test for incognito windows.
- // The newly created incoginito window should be created against the current
- // active |browser1|'s profile.
- browser1->window()->Show();
- ash::WmShell::Get()->new_window_delegate()->NewWindow(true);
- EXPECT_EQ(chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow())
- ->profile()
- ->GetOriginalProfile(),
- profile1);
-
- // The newly created incoginito window should be created against the current
- // active |browser2|'s profile.
- browser2->window()->Show();
- ash::WmShell::Get()->new_window_delegate()->NewWindow(true);
- EXPECT_EQ(chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow())
- ->profile()
- ->GetOriginalProfile(),
- profile2);
-}
« no previous file with comments | « chrome/browser/ui/ash/chrome_new_window_delegate.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698