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

Unified Diff: chrome/browser/ui/ash/app_list/app_list_controller_ash.cc

Issue 2860503002: mash: Replace int ShelfIDs with AppLaunchID strings. (Closed)
Patch Set: Fix struct traits typo. Created 3 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 | « ash/wm/window_properties.cc ('k') | chrome/browser/ui/ash/chrome_launcher_prefs.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/app_list/app_list_controller_ash.cc
diff --git a/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc b/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc
index 94d2e395c671c98c692a720eeb9ad20a17a504fe..d02eeaadddb88eaa79e9ab3dfcfabcd3663fed5b 100644
--- a/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc
+++ b/chrome/browser/ui/ash/app_list/app_list_controller_ash.cc
@@ -44,7 +44,7 @@ bool AppListControllerDelegateAsh::IsAppPinned(const std::string& app_id) {
bool AppListControllerDelegateAsh::IsAppOpen(const std::string& app_id) const {
ash::ShelfID id =
ash::Shell::Get()->shelf_model()->GetShelfIDForAppID(app_id);
- return id && ChromeLauncherController::instance()->IsOpen(id);
+ return !id.IsNull() && ChromeLauncherController::instance()->IsOpen(id);
}
void AppListControllerDelegateAsh::PinApp(const std::string& app_id) {
@@ -116,7 +116,7 @@ void AppListControllerDelegateAsh::LaunchApp(
AppListSource source,
int event_flags) {
ChromeLauncherController::instance()->LaunchApp(
- ash::AppLaunchId(extension->id()), AppListSourceToLaunchSource(source),
+ ash::ShelfID(extension->id()), AppListSourceToLaunchSource(source),
event_flags);
DismissView();
}
« no previous file with comments | « ash/wm/window_properties.cc ('k') | chrome/browser/ui/ash/chrome_launcher_prefs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698