chrome/browser/ui/startup/startup_browser_creator_impl.cc - Issue 720633003: Revert of CL 722703002 due to build breakage

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/startup/startup_browser_creator_impl.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

« no previous file with comments | « chrome/browser/ui/extensions/application_launch.cc ('k') | chrome/browser/ui/views/frame/browser_window_property_manager_browsertest_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/startup/startup_browser_creator_impl.cc

diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc

index 266e6a732e68cea0b4c8071877fd8d4b4538e130..6abbea5cee7552c5fb20571523a38c565bba6dfb 100644

--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc

+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc

@@ -57,7 +57,6 @@

#include "chrome/browser/ui/browser_tabrestore.h"

#include "chrome/browser/ui/browser_tabstrip.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/autolaunch_prompt.h"

@@ -337,8 +336,7 @@ bool StartupBrowserCreatorImpl::Launch(Profile* profile,

if (extension) {

RecordCmdLineAppHistogram(extensions::Manifest::TYPE_PLATFORM_APP);

AppLaunchParams params(profile, extension,

- extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW,

- extensions::SOURCE_COMMAND_LINE);

+ extensions::LAUNCH_CONTAINER_NONE, NEW_WINDOW);

params.command_line = command_line_;

params.current_directory = cur_dir_;

// If we are being launched from the command line, default to native

@@ -426,9 +424,9 @@ bool StartupBrowserCreatorImpl::OpenApplicationTab(Profile* profile) {

RecordCmdLineAppHistogram(extension->GetType());

- WebContents* app_tab = OpenApplication(

- AppLaunchParams(profile, extension, extensions::LAUNCH_CONTAINER_TAB,

- NEW_FOREGROUND_TAB, extensions::SOURCE_COMMAND_LINE));

+ WebContents* app_tab = OpenApplication(AppLaunchParams(

+ profile, extension, extensions::LAUNCH_CONTAINER_TAB,

+ NEW_FOREGROUND_TAB));

return (app_tab != NULL);

}

@@ -462,8 +460,7 @@ bool StartupBrowserCreatorImpl::OpenApplicationWindow(

RecordCmdLineAppHistogram(extension->GetType());

- AppLaunchParams params(profile, extension, launch_container, NEW_WINDOW,

- extensions::SOURCE_COMMAND_LINE);

+ AppLaunchParams params(profile, extension, launch_container, NEW_WINDOW);

params.command_line = command_line_;

params.current_directory = cur_dir_;

WebContents* tab_in_app_window = OpenApplication(params);