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

Unified Diff: chrome/browser/ui/startup/startup_browser_creator_impl.cc

Issue 10700130: Introduce LaunchParams struct for opening chrome apps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix bad merge Created 8 years, 5 months 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/ash/extension_utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 a6a09e89bc733940ecffef1f92fa44c9dd3dce59..9db6e384b88e15db808068681621c5e4d311b285 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -432,8 +432,9 @@ bool StartupBrowserCreatorImpl::OpenApplicationTab(Profile* profile) {
RecordCmdLineAppHistogram();
- WebContents* app_tab = application_launch::OpenApplicationTab(
- profile, extension, GURL(), NEW_FOREGROUND_TAB);
+ WebContents* app_tab = application_launch::OpenApplication(
+ application_launch::LaunchParams(profile, extension,
+ extension_misc::LAUNCH_TAB, NEW_FOREGROUND_TAB));
return (app_tab != NULL);
}
@@ -467,9 +468,11 @@ bool StartupBrowserCreatorImpl::OpenApplicationWindow(
RecordCmdLineAppHistogram();
+ application_launch::LaunchParams params(profile, extension,
+ launch_container, NEW_WINDOW);
+ params.command_line = &command_line_;
WebContents* tab_in_app_window = application_launch::OpenApplication(
- profile, extension, launch_container, GURL(), NEW_WINDOW,
- &command_line_);
+ params);
if (out_app_contents)
*out_app_contents = tab_in_app_window;
@@ -501,8 +504,7 @@ bool StartupBrowserCreatorImpl::OpenApplicationWindow(
WebContents* app_tab = application_launch::OpenAppShortcutWindow(
profile,
- url,
- true); // Update app info.
+ url);
if (out_app_contents)
*out_app_contents = app_tab;
« no previous file with comments | « chrome/browser/ui/extensions/application_launch.cc ('k') | chrome/browser/ui/views/ash/extension_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698