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

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

Issue 10409023: Remove extension application launch code from Browser (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 7 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/panels/panel_app_browsertest.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 fca8b92769660c91286b937fea7bac855effed59..34e7e3a93c379637848bf1d3a3f527ca22ac9704 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -45,6 +45,7 @@
#include "chrome/browser/ui/browser_list.h"
#include "chrome/browser/ui/browser_navigator.h"
#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/extensions/application_launch.h"
#include "chrome/browser/ui/startup/autolaunch_prompt.h"
#include "chrome/browser/ui/startup/bad_flags_prompt.h"
#include "chrome/browser/ui/startup/default_browser_prompt.h"
@@ -397,8 +398,8 @@ bool StartupBrowserCreatorImpl::OpenApplicationTab(Profile* profile) {
RecordCmdLineAppHistogram();
- WebContents* app_tab = Browser::OpenApplicationTab(profile, extension, GURL(),
- NEW_FOREGROUND_TAB);
+ WebContents* app_tab = application_launch::OpenApplicationTab(
+ profile, extension, GURL(), NEW_FOREGROUND_TAB);
return (app_tab != NULL);
}
@@ -425,7 +426,7 @@ bool StartupBrowserCreatorImpl::OpenApplicationWindow(Profile* profile) {
return false;
RecordCmdLineAppHistogram();
- WebContents* tab_in_app_window = Browser::OpenApplication(
+ WebContents* tab_in_app_window = application_launch::OpenApplication(
profile, extension, launch_container, GURL(), NEW_WINDOW);
// Platform apps fire off a launch event which may or may not open a window.
return (tab_in_app_window != NULL || extension->is_platform_app());
@@ -452,7 +453,7 @@ bool StartupBrowserCreatorImpl::OpenApplicationWindow(Profile* profile) {
AppLauncherHandler::RecordAppLaunchType(
extension_misc::APP_LAUNCH_CMD_LINE_APP_LEGACY);
}
- WebContents* app_tab = Browser::OpenAppShortcutWindow(
+ WebContents* app_tab = application_launch::OpenAppShortcutWindow(
profile,
url,
true); // Update app info.
« no previous file with comments | « chrome/browser/ui/panels/panel_app_browsertest.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