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

Unified Diff: chrome/browser/ui/webui/ntp/app_launcher_handler.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/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 c9c973b98dfb1978f5342118059607bfd0d83169..8389d98e1b115f7d6ed0806fbc1caccefb32f729 100644
--- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
+++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
@@ -30,7 +30,6 @@
#include "chrome/browser/ui/browser_finder.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/extensions/extension_enable_flow.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ -521,11 +520,12 @@ void AppLauncherHandler::HandleLaunchApp(const base::ListValue* args) {
disposition == NEW_WINDOW) {
// TODO(jamescook): Proper support for background tabs.
AppLaunchParams params(profile, extension,
- disposition == NEW_WINDOW
- ? extensions::LAUNCH_CONTAINER_WINDOW
- : extensions::LAUNCH_CONTAINER_TAB,
- disposition, extensions::SOURCE_NEW_TAB_PAGE);
+ disposition == NEW_WINDOW ?
+ extensions::LAUNCH_CONTAINER_WINDOW :
+ extensions::LAUNCH_CONTAINER_TAB,
+ disposition);
params.override_url = GURL(url);
+ params.source = extensions::SOURCE_NEW_TAB_PAGE;
OpenApplication(params);
} else {
// To give a more "launchy" experience when using the NTP launcher, we close
@@ -537,9 +537,9 @@ void AppLauncherHandler::HandleLaunchApp(const base::ListValue* args) {
old_contents = browser->tab_strip_model()->GetActiveWebContents();
AppLaunchParams params(profile, extension,
- old_contents ? CURRENT_TAB : NEW_FOREGROUND_TAB,
- extensions::SOURCE_NEW_TAB_PAGE);
+ old_contents ? CURRENT_TAB : NEW_FOREGROUND_TAB);
params.override_url = GURL(url);
+ params.source = extensions::SOURCE_NEW_TAB_PAGE;
WebContents* new_contents = OpenApplication(params);
// This will also destroy the handler, so do not perform any actions after.
« no previous file with comments | « chrome/browser/ui/webui/extensions/extension_settings_handler.cc ('k') | chrome/test/ppapi/ppapi_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698