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

Unified Diff: chrome/browser/ui/webui/ntp/app_launcher_handler.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/views/ash/extension_utils.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/ntp/app_launcher_handler.cc
diff --git a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
index 9963f23365ed3166189b2f0d98c5111a6e214871..7cf5db83048ed5e3dac062a499658fd231ae49b7 100644
--- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
+++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
@@ -27,9 +27,9 @@
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/prefs/scoped_user_pref_update.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/extensions/application_launch.h"
#include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
#include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
#include "chrome/browser/ui/webui/web_ui_util.h"
@@ -544,11 +544,11 @@ void AppLauncherHandler::HandleLaunchApp(const ListValue* args) {
if (disposition == NEW_FOREGROUND_TAB || disposition == NEW_BACKGROUND_TAB) {
// TODO(jamescook): Proper support for background tabs.
- Browser::OpenApplication(
+ application_launch::OpenApplication(
profile, extension, extension_misc::LAUNCH_TAB, GURL(url), disposition);
} else if (disposition == NEW_WINDOW) {
// Force a new window open.
- Browser::OpenApplication(
+ application_launch::OpenApplication(
profile, extension, extension_misc::LAUNCH_WINDOW, GURL(url),
disposition);
} else {
@@ -565,7 +565,7 @@ void AppLauncherHandler::HandleLaunchApp(const ListValue* args) {
if (browser)
old_contents = browser->GetSelectedWebContents();
- WebContents* new_contents = Browser::OpenApplication(
+ WebContents* new_contents = application_launch::OpenApplication(
profile, extension, launch_container, GURL(url),
old_contents ? CURRENT_TAB : NEW_FOREGROUND_TAB);
« no previous file with comments | « chrome/browser/ui/views/ash/extension_utils.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698