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

Unified Diff: chrome/browser/ui/ash/launcher/launcher_controller_helper.cc

Issue 2696073002: Merge ShelfItemDelegate::ItemSelected & LauncherItemDelegate::Activate. (Closed)
Patch Set: nit Created 3 years, 10 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
Index: chrome/browser/ui/ash/launcher/launcher_controller_helper.cc
diff --git a/chrome/browser/ui/ash/launcher/launcher_controller_helper.cc b/chrome/browser/ui/ash/launcher/launcher_controller_helper.cc
index 35f1e2084af532482c33c749366d01adbeb2e109..e477de255fcf812101f41984db9b509d69a96308 100644
--- a/chrome/browser/ui/ash/launcher/launcher_controller_helper.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_controller_helper.cc
@@ -84,7 +84,7 @@ const extensions::Extension* GetExtensionByID(Profile* profile,
id, extensions::ExtensionRegistry::EVERYTHING);
}
-std::string GetSourceFromAppListSource(ash::LaunchSource source) {
+std::string GetSourceFromAppListSource(ash::ShelfLaunchSource source) {
switch (source) {
case ash::LAUNCH_FROM_APP_LIST:
return std::string(extension_urls::kLaunchSourceAppList);
@@ -170,7 +170,7 @@ bool LauncherControllerHelper::IsValidIDForCurrentUser(
}
void LauncherControllerHelper::LaunchApp(ash::AppLauncherId id,
- ash::LaunchSource source,
+ ash::ShelfLaunchSource source,
int event_flags) {
const std::string& app_id = id.app_id();
const ArcAppListPrefs* arc_prefs = GetArcAppListPrefs();
« no previous file with comments | « chrome/browser/ui/ash/launcher/launcher_controller_helper.h ('k') | chrome/browser/ui/ash/launcher/launcher_item_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698