| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 1328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1339 ASSERT_TRUE(test_server()->Start()); | 1339 ASSERT_TRUE(test_server()->Start()); |
| 1340 | 1340 |
| 1341 // Load an app. | 1341 // Load an app. |
| 1342 host_resolver()->AddRule("www.example.com", "127.0.0.1"); | 1342 host_resolver()->AddRule("www.example.com", "127.0.0.1"); |
| 1343 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/"))); | 1343 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/"))); |
| 1344 const Extension* extension_app = GetExtension(); | 1344 const Extension* extension_app = GetExtension(); |
| 1345 | 1345 |
| 1346 // Launch it in a window, as AppLauncherHandler::HandleLaunchApp() would. | 1346 // Launch it in a window, as AppLauncherHandler::HandleLaunchApp() would. |
| 1347 WebContents* app_window = OpenApplication(AppLaunchParams( | 1347 WebContents* app_window = OpenApplication(AppLaunchParams( |
| 1348 browser()->profile(), extension_app, extensions::LAUNCH_CONTAINER_WINDOW, | 1348 browser()->profile(), extension_app, extensions::LAUNCH_CONTAINER_WINDOW, |
| 1349 NEW_WINDOW, extensions::SOURCE_UNTRACKED)); | 1349 NEW_WINDOW, extensions::SOURCE_TEST)); |
| 1350 ASSERT_TRUE(app_window); | 1350 ASSERT_TRUE(app_window); |
| 1351 | 1351 |
| 1352 DevToolsWindow* devtools_window = | 1352 DevToolsWindow* devtools_window = |
| 1353 DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), false); | 1353 DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), false); |
| 1354 | 1354 |
| 1355 // The launch should have created a new app browser and a dev tools browser. | 1355 // The launch should have created a new app browser and a dev tools browser. |
| 1356 ASSERT_EQ(3u, | 1356 ASSERT_EQ(3u, |
| 1357 chrome::GetBrowserCount(browser()->profile(), | 1357 chrome::GetBrowserCount(browser()->profile(), |
| 1358 browser()->host_desktop_type())); | 1358 browser()->host_desktop_type())); |
| 1359 | 1359 |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1531 ASSERT_TRUE(test_server()->Start()); | 1531 ASSERT_TRUE(test_server()->Start()); |
| 1532 | 1532 |
| 1533 // Load an app | 1533 // Load an app |
| 1534 host_resolver()->AddRule("www.example.com", "127.0.0.1"); | 1534 host_resolver()->AddRule("www.example.com", "127.0.0.1"); |
| 1535 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/"))); | 1535 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/"))); |
| 1536 const Extension* extension_app = GetExtension(); | 1536 const Extension* extension_app = GetExtension(); |
| 1537 | 1537 |
| 1538 // Launch it in a window, as AppLauncherHandler::HandleLaunchApp() would. | 1538 // Launch it in a window, as AppLauncherHandler::HandleLaunchApp() would. |
| 1539 WebContents* app_window = OpenApplication(AppLaunchParams( | 1539 WebContents* app_window = OpenApplication(AppLaunchParams( |
| 1540 browser()->profile(), extension_app, extensions::LAUNCH_CONTAINER_WINDOW, | 1540 browser()->profile(), extension_app, extensions::LAUNCH_CONTAINER_WINDOW, |
| 1541 NEW_WINDOW, extensions::SOURCE_UNTRACKED)); | 1541 NEW_WINDOW, extensions::SOURCE_TEST)); |
| 1542 ASSERT_TRUE(app_window); | 1542 ASSERT_TRUE(app_window); |
| 1543 | 1543 |
| 1544 // Apps launched in a window from the NTP have an extensions tab helper but | 1544 // Apps launched in a window from the NTP have an extensions tab helper but |
| 1545 // do not have extension_app set in it. | 1545 // do not have extension_app set in it. |
| 1546 ASSERT_TRUE(extensions::TabHelper::FromWebContents(app_window)); | 1546 ASSERT_TRUE(extensions::TabHelper::FromWebContents(app_window)); |
| 1547 EXPECT_FALSE( | 1547 EXPECT_FALSE( |
| 1548 extensions::TabHelper::FromWebContents(app_window)->extension_app()); | 1548 extensions::TabHelper::FromWebContents(app_window)->extension_app()); |
| 1549 EXPECT_EQ(extensions::AppLaunchInfo::GetFullLaunchURL(extension_app), | 1549 EXPECT_EQ(extensions::AppLaunchInfo::GetFullLaunchURL(extension_app), |
| 1550 app_window->GetURL()); | 1550 app_window->GetURL()); |
| 1551 | 1551 |
| (...skipping 1102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2654 #endif | 2654 #endif |
| 2655 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); | 2655 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); |
| 2656 EXPECT_EQ(exp_commit_size, wcv_commit_size2); | 2656 EXPECT_EQ(exp_commit_size, wcv_commit_size2); |
| 2657 gfx::Size exp_final_size(initial_wcv_size); | 2657 gfx::Size exp_final_size(initial_wcv_size); |
| 2658 exp_final_size.Enlarge(wcv_resize_insets.width(), | 2658 exp_final_size.Enlarge(wcv_resize_insets.width(), |
| 2659 wcv_resize_insets.height() + height_inset); | 2659 wcv_resize_insets.height() + height_inset); |
| 2660 EXPECT_EQ(exp_final_size, | 2660 EXPECT_EQ(exp_final_size, |
| 2661 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); | 2661 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); |
| 2662 EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size()); | 2662 EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size()); |
| 2663 } | 2663 } |
| OLD | NEW |