OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/new_window_controller.h" | 5 #include "ash/common/new_window_controller.h" |
| 6 #include "ash/common/wm_shell.h" |
6 #include "ash/wm/window_util.h" | 7 #include "ash/wm/window_util.h" |
7 #include "ash/wm_shell.h" | |
8 #include "chrome/browser/profiles/profile_manager.h" | 8 #include "chrome/browser/profiles/profile_manager.h" |
9 #include "chrome/browser/ui/browser_finder.h" | 9 #include "chrome/browser/ui/browser_finder.h" |
10 #include "chrome/browser/ui/browser_window.h" | 10 #include "chrome/browser/ui/browser_window.h" |
11 #include "chrome/test/base/in_process_browser_test.h" | 11 #include "chrome/test/base/in_process_browser_test.h" |
12 #include "components/session_manager/core/session_manager.h" | 12 #include "components/session_manager/core/session_manager.h" |
13 #include "components/signin/core/account_id/account_id.h" | 13 #include "components/signin/core/account_id/account_id.h" |
14 #include "testing/gtest/include/gtest/gtest.h" | 14 #include "testing/gtest/include/gtest/gtest.h" |
15 #include "ui/aura/window.h" | 15 #include "ui/aura/window.h" |
16 | 16 |
17 namespace { | 17 namespace { |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
72 | 72 |
73 // The newly created incoginito window should be created against the current | 73 // The newly created incoginito window should be created against the current |
74 // active |browser2|'s profile. | 74 // active |browser2|'s profile. |
75 browser2->window()->Show(); | 75 browser2->window()->Show(); |
76 ash::WmShell::Get()->new_window_controller()->NewWindow(true); | 76 ash::WmShell::Get()->new_window_controller()->NewWindow(true); |
77 EXPECT_EQ(chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow()) | 77 EXPECT_EQ(chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow()) |
78 ->profile() | 78 ->profile() |
79 ->GetOriginalProfile(), | 79 ->GetOriginalProfile(), |
80 profile2); | 80 profile2); |
81 } | 81 } |
OLD | NEW |