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

Side by Side Diff: chrome/browser/ui/browser_browsertest.cc

Issue 722703002: Make "source" a required argument of AppLaunchParams and fill in the argument in all call points. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 22 matching lines...) Expand all
33 #include "chrome/browser/translate/cld_data_harness.h" 33 #include "chrome/browser/translate/cld_data_harness.h"
34 #include "chrome/browser/ui/browser.h" 34 #include "chrome/browser/ui/browser.h"
35 #include "chrome/browser/ui/browser_command_controller.h" 35 #include "chrome/browser/ui/browser_command_controller.h"
36 #include "chrome/browser/ui/browser_commands.h" 36 #include "chrome/browser/ui/browser_commands.h"
37 #include "chrome/browser/ui/browser_finder.h" 37 #include "chrome/browser/ui/browser_finder.h"
38 #include "chrome/browser/ui/browser_iterator.h" 38 #include "chrome/browser/ui/browser_iterator.h"
39 #include "chrome/browser/ui/browser_navigator.h" 39 #include "chrome/browser/ui/browser_navigator.h"
40 #include "chrome/browser/ui/browser_tabstrip.h" 40 #include "chrome/browser/ui/browser_tabstrip.h"
41 #include "chrome/browser/ui/browser_ui_prefs.h" 41 #include "chrome/browser/ui/browser_ui_prefs.h"
42 #include "chrome/browser/ui/browser_window.h" 42 #include "chrome/browser/ui/browser_window.h"
43 #include "chrome/browser/ui/extensions/app_launch_params.h"
43 #include "chrome/browser/ui/extensions/application_launch.h" 44 #include "chrome/browser/ui/extensions/application_launch.h"
44 #include "chrome/browser/ui/host_desktop.h" 45 #include "chrome/browser/ui/host_desktop.h"
45 #include "chrome/browser/ui/startup/startup_browser_creator.h" 46 #include "chrome/browser/ui/startup/startup_browser_creator.h"
46 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h" 47 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h"
47 #include "chrome/browser/ui/tabs/pinned_tab_codec.h" 48 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
48 #include "chrome/browser/ui/tabs/tab_strip_model.h" 49 #include "chrome/browser/ui/tabs/tab_strip_model.h"
49 #include "chrome/common/chrome_switches.h" 50 #include "chrome/common/chrome_switches.h"
50 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" 51 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
51 #include "chrome/common/pref_names.h" 52 #include "chrome/common/pref_names.h"
52 #include "chrome/common/url_constants.h" 53 #include "chrome/common/url_constants.h"
(...skipping 22 matching lines...) Expand all
75 #include "content/public/browser/resource_context.h" 76 #include "content/public/browser/resource_context.h"
76 #include "content/public/browser/web_contents.h" 77 #include "content/public/browser/web_contents.h"
77 #include "content/public/browser/web_contents_observer.h" 78 #include "content/public/browser/web_contents_observer.h"
78 #include "content/public/common/frame_navigate_params.h" 79 #include "content/public/common/frame_navigate_params.h"
79 #include "content/public/common/renderer_preferences.h" 80 #include "content/public/common/renderer_preferences.h"
80 #include "content/public/common/url_constants.h" 81 #include "content/public/common/url_constants.h"
81 #include "content/public/test/browser_test_utils.h" 82 #include "content/public/test/browser_test_utils.h"
82 #include "content/public/test/test_navigation_observer.h" 83 #include "content/public/test/test_navigation_observer.h"
83 #include "extensions/browser/extension_system.h" 84 #include "extensions/browser/extension_system.h"
84 #include "extensions/browser/uninstall_reason.h" 85 #include "extensions/browser/uninstall_reason.h"
86 #include "extensions/common/constants.h"
85 #include "extensions/common/extension.h" 87 #include "extensions/common/extension.h"
86 #include "extensions/common/extension_set.h" 88 #include "extensions/common/extension_set.h"
87 #include "net/dns/mock_host_resolver.h" 89 #include "net/dns/mock_host_resolver.h"
88 #include "net/test/spawned_test_server/spawned_test_server.h" 90 #include "net/test/spawned_test_server/spawned_test_server.h"
89 #include "ui/base/l10n/l10n_util.h" 91 #include "ui/base/l10n/l10n_util.h"
90 #include "ui/base/page_transition_types.h" 92 #include "ui/base/page_transition_types.h"
91 93
92 #if defined(OS_MACOSX) 94 #if defined(OS_MACOSX)
93 #include "base/mac/mac_util.h" 95 #include "base/mac/mac_util.h"
94 #include "base/mac/scoped_nsautorelease_pool.h" 96 #include "base/mac/scoped_nsautorelease_pool.h"
(...skipping 1236 matching lines...) Expand 10 before | Expand all | Expand 10 after
1331 // bar settings are correct. 1333 // bar settings are correct.
1332 IN_PROC_BROWSER_TEST_F(BrowserTest, ShouldShowLocationBar) { 1334 IN_PROC_BROWSER_TEST_F(BrowserTest, ShouldShowLocationBar) {
1333 ASSERT_TRUE(test_server()->Start()); 1335 ASSERT_TRUE(test_server()->Start());
1334 1336
1335 // Load an app. 1337 // Load an app.
1336 host_resolver()->AddRule("www.example.com", "127.0.0.1"); 1338 host_resolver()->AddRule("www.example.com", "127.0.0.1");
1337 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/"))); 1339 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/")));
1338 const Extension* extension_app = GetExtension(); 1340 const Extension* extension_app = GetExtension();
1339 1341
1340 // Launch it in a window, as AppLauncherHandler::HandleLaunchApp() would. 1342 // Launch it in a window, as AppLauncherHandler::HandleLaunchApp() would.
1341 WebContents* app_window = 1343 WebContents* app_window = OpenApplication(AppLaunchParams(
1342 OpenApplication(AppLaunchParams(browser()->profile(), 1344 browser()->profile(), extension_app, extensions::LAUNCH_CONTAINER_WINDOW,
1343 extension_app, 1345 NEW_WINDOW, extensions::SOURCE_UNTRACKED));
1344 extensions::LAUNCH_CONTAINER_WINDOW,
1345 NEW_WINDOW));
1346 ASSERT_TRUE(app_window); 1346 ASSERT_TRUE(app_window);
1347 1347
1348 DevToolsWindow* devtools_window = 1348 DevToolsWindow* devtools_window =
1349 DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), false); 1349 DevToolsWindowTesting::OpenDevToolsWindowSync(browser(), false);
1350 1350
1351 // The launch should have created a new app browser and a dev tools browser. 1351 // The launch should have created a new app browser and a dev tools browser.
1352 ASSERT_EQ(3u, 1352 ASSERT_EQ(3u,
1353 chrome::GetBrowserCount(browser()->profile(), 1353 chrome::GetBrowserCount(browser()->profile(),
1354 browser()->host_desktop_type())); 1354 browser()->host_desktop_type()));
1355 1355
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
1525 #if !defined(OS_MACOSX) 1525 #if !defined(OS_MACOSX)
1526 IN_PROC_BROWSER_TEST_F(BrowserTest, OpenAppWindowLikeNtp) { 1526 IN_PROC_BROWSER_TEST_F(BrowserTest, OpenAppWindowLikeNtp) {
1527 ASSERT_TRUE(test_server()->Start()); 1527 ASSERT_TRUE(test_server()->Start());
1528 1528
1529 // Load an app 1529 // Load an app
1530 host_resolver()->AddRule("www.example.com", "127.0.0.1"); 1530 host_resolver()->AddRule("www.example.com", "127.0.0.1");
1531 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/"))); 1531 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("app/")));
1532 const Extension* extension_app = GetExtension(); 1532 const Extension* extension_app = GetExtension();
1533 1533
1534 // Launch it in a window, as AppLauncherHandler::HandleLaunchApp() would. 1534 // Launch it in a window, as AppLauncherHandler::HandleLaunchApp() would.
1535 WebContents* app_window = OpenApplication( 1535 WebContents* app_window = OpenApplication(AppLaunchParams(
1536 AppLaunchParams(browser()->profile(), extension_app, 1536 browser()->profile(), extension_app, extensions::LAUNCH_CONTAINER_WINDOW,
1537 extensions::LAUNCH_CONTAINER_WINDOW, NEW_WINDOW)); 1537 NEW_WINDOW, extensions::SOURCE_UNTRACKED));
1538 ASSERT_TRUE(app_window); 1538 ASSERT_TRUE(app_window);
1539 1539
1540 // Apps launched in a window from the NTP have an extensions tab helper but 1540 // Apps launched in a window from the NTP have an extensions tab helper but
1541 // do not have extension_app set in it. 1541 // do not have extension_app set in it.
1542 ASSERT_TRUE(extensions::TabHelper::FromWebContents(app_window)); 1542 ASSERT_TRUE(extensions::TabHelper::FromWebContents(app_window));
1543 EXPECT_FALSE( 1543 EXPECT_FALSE(
1544 extensions::TabHelper::FromWebContents(app_window)->extension_app()); 1544 extensions::TabHelper::FromWebContents(app_window)->extension_app());
1545 EXPECT_EQ(extensions::AppLaunchInfo::GetFullLaunchURL(extension_app), 1545 EXPECT_EQ(extensions::AppLaunchInfo::GetFullLaunchURL(extension_app),
1546 app_window->GetURL()); 1546 app_window->GetURL());
1547 1547
(...skipping 1100 matching lines...) Expand 10 before | Expand all | Expand 10 after
2648 #endif 2648 #endif
2649 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); 2649 EXPECT_EQ(exp_commit_size, rwhv_commit_size2);
2650 EXPECT_EQ(exp_commit_size, wcv_commit_size2); 2650 EXPECT_EQ(exp_commit_size, wcv_commit_size2);
2651 gfx::Size exp_final_size(initial_wcv_size); 2651 gfx::Size exp_final_size(initial_wcv_size);
2652 exp_final_size.Enlarge(wcv_resize_insets.width(), 2652 exp_final_size.Enlarge(wcv_resize_insets.width(),
2653 wcv_resize_insets.height() + height_inset); 2653 wcv_resize_insets.height() + height_inset);
2654 EXPECT_EQ(exp_final_size, 2654 EXPECT_EQ(exp_final_size,
2655 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); 2655 web_contents->GetRenderWidgetHostView()->GetViewBounds().size());
2656 EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size()); 2656 EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size());
2657 } 2657 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698