| 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();
|
| }
|
|
|