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

Unified Diff: chrome/browser/ui/browser_browsertest.cc

Issue 720633003: Revert of CL 722703002 due to build breakage (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: revert 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/browser_browsertest.cc
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index cb1a8daf34052a48277ee93cabf34ff6458c6832..c7e91e182fe3609f82729433fec59282d8fd8976 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -40,7 +40,6 @@
#include "chrome/browser/ui/browser_tabstrip.h"
#include "chrome/browser/ui/browser_ui_prefs.h"
#include "chrome/browser/ui/browser_window.h"
-#include "chrome/browser/ui/extensions/app_launch_params.h"
#include "chrome/browser/ui/extensions/application_launch.h"
#include "chrome/browser/ui/host_desktop.h"
#include "chrome/browser/ui/startup/startup_browser_creator.h"
@@ -85,7 +84,6 @@
#include "extensions/browser/extension_registry.h"
#include "extensions/browser/extension_system.h"
#include "extensions/browser/uninstall_reason.h"
-#include "extensions/common/constants.h"
#include "extensions/common/extension.h"
#include "extensions/common/extension_set.h"
#include "net/dns/mock_host_resolver.h"
@@ -1344,9 +1342,11 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, ShouldShowLocationBar) {
const Extension* extension_app = GetExtension();
// Launch it in a window, as AppLauncherHandler::HandleLaunchApp() would.
- WebContents* app_window = OpenApplication(AppLaunchParams(
- browser()->profile(), extension_app, extensions::LAUNCH_CONTAINER_WINDOW,
- NEW_WINDOW, extensions::SOURCE_UNTRACKED));
+ WebContents* app_window =
+ OpenApplication(AppLaunchParams(browser()->profile(),
+ extension_app,
+ extensions::LAUNCH_CONTAINER_WINDOW,
+ NEW_WINDOW));
ASSERT_TRUE(app_window);
DevToolsWindow* devtools_window =
@@ -1536,9 +1536,9 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, OpenAppWindowLikeNtp) {
const Extension* extension_app = GetExtension();
// Launch it in a window, as AppLauncherHandler::HandleLaunchApp() would.
- WebContents* app_window = OpenApplication(AppLaunchParams(
- browser()->profile(), extension_app, extensions::LAUNCH_CONTAINER_WINDOW,
- NEW_WINDOW, extensions::SOURCE_UNTRACKED));
+ WebContents* app_window = OpenApplication(
+ AppLaunchParams(browser()->profile(), extension_app,
+ extensions::LAUNCH_CONTAINER_WINDOW, NEW_WINDOW));
ASSERT_TRUE(app_window);
// Apps launched in a window from the NTP have an extensions tab helper but
« no previous file with comments | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc ('k') | chrome/browser/ui/chrome_pages.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698