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

Unified Diff: chrome/browser/ui/webui/ntp/app_launcher_handler.cc

Issue 722703002: Make "source" a required argument of AppLaunchParams and fill in the argument in all call points. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 d3bef85e15667ce289855cd3c7fc79bbf5b1d839..0987cbbba245931637fe2ebae5a121fee1d992cb 100644
--- a/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
+++ b/chrome/browser/ui/webui/ntp/app_launcher_handler.cc
@@ -30,6 +30,7 @@
#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,12 +522,11 @@ 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);
+ disposition == NEW_WINDOW
+ ? extensions::LAUNCH_CONTAINER_WINDOW
+ : extensions::LAUNCH_CONTAINER_TAB,
+ disposition, extensions::SOURCE_NEW_TAB_PAGE);
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
@@ -538,9 +538,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);
+ old_contents ? CURRENT_TAB : NEW_FOREGROUND_TAB,
+ extensions::SOURCE_NEW_TAB_PAGE);
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.

Powered by Google App Engine
This is Rietveld 408576698