OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 <string> | 5 #include <string> |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
9 #include "chrome/browser/devtools/devtools_window_testing.h" | 9 #include "chrome/browser/devtools/devtools_window_testing.h" |
10 #include "chrome/browser/extensions/extension_browsertest.h" | 10 #include "chrome/browser/extensions/extension_browsertest.h" |
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
217 // Launch it in a window, as AppLauncherHandler::HandleLaunchApp() would. | 217 // Launch it in a window, as AppLauncherHandler::HandleLaunchApp() would. |
218 WebContents* packaged_app_window = OpenApplication(AppLaunchParams( | 218 WebContents* packaged_app_window = OpenApplication(AppLaunchParams( |
219 browser()->profile(), packaged_app, extensions::LAUNCH_CONTAINER_WINDOW, | 219 browser()->profile(), packaged_app, extensions::LAUNCH_CONTAINER_WINDOW, |
220 NEW_WINDOW, extensions::SOURCE_UNTRACKED)); | 220 NEW_WINDOW, extensions::SOURCE_UNTRACKED)); |
221 ASSERT_TRUE(packaged_app_window); | 221 ASSERT_TRUE(packaged_app_window); |
222 | 222 |
223 DevToolsWindow* devtools_window = | 223 DevToolsWindow* devtools_window = |
224 DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), false); | 224 DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), false); |
225 | 225 |
226 // The launch should have created a new app browser and a dev tools browser. | 226 // The launch should have created a new app browser and a dev tools browser. |
227 ASSERT_EQ(4u, chrome::GetBrowserCount(browser()->profile(), | 227 ASSERT_EQ(4u, chrome::GetBrowserCount(browser()->profile())); |
228 browser()->host_desktop_type())); | |
229 | 228 |
230 // Find the new browsers. | 229 // Find the new browsers. |
231 Browser* bookmark_app_browser = nullptr; | 230 Browser* bookmark_app_browser = nullptr; |
232 Browser* packaged_app_browser = nullptr; | 231 Browser* packaged_app_browser = nullptr; |
233 Browser* dev_tools_browser = nullptr; | 232 Browser* dev_tools_browser = nullptr; |
234 for (auto* b : *BrowserList::GetInstance()) { | 233 for (auto* b : *BrowserList::GetInstance()) { |
235 if (b == browser()) { | 234 if (b == browser()) { |
236 continue; | 235 continue; |
237 } else if (b->app_name() == DevToolsWindow::kDevToolsApp) { | 236 } else if (b->app_name() == DevToolsWindow::kDevToolsApp) { |
238 dev_tools_browser = b; | 237 dev_tools_browser = b; |
(...skipping 15 matching lines...) Expand all Loading... |
254 EXPECT_FALSE( | 253 EXPECT_FALSE( |
255 dev_tools_browser->SupportsWindowFeature(Browser::FEATURE_WEBAPPFRAME)); | 254 dev_tools_browser->SupportsWindowFeature(Browser::FEATURE_WEBAPPFRAME)); |
256 EXPECT_EQ(browser()->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH, | 255 EXPECT_EQ(browser()->host_desktop_type() == chrome::HOST_DESKTOP_TYPE_ASH, |
257 bookmark_app_browser->SupportsWindowFeature( | 256 bookmark_app_browser->SupportsWindowFeature( |
258 Browser::FEATURE_WEBAPPFRAME)); | 257 Browser::FEATURE_WEBAPPFRAME)); |
259 EXPECT_FALSE(packaged_app_browser->SupportsWindowFeature( | 258 EXPECT_FALSE(packaged_app_browser->SupportsWindowFeature( |
260 Browser::FEATURE_WEBAPPFRAME)); | 259 Browser::FEATURE_WEBAPPFRAME)); |
261 | 260 |
262 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools_window); | 261 DevToolsWindowTesting::CloseDevToolsWindowSync(devtools_window); |
263 } | 262 } |
OLD | NEW |