| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h" | 5 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.h" |
| 6 | 6 |
| 7 #include "base/strings/string_util.h" | 7 #include "base/strings/string_util.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/profiles/profile_manager.h" | 9 #include "chrome/browser/profiles/profile_manager.h" |
| 10 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" | 10 #include "chrome/browser/ui/ash/chrome_launcher_prefs.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 mojo::AssociatedGroup* associated_group) { | 26 mojo::AssociatedGroup* associated_group) { |
| 27 DCHECK(!item_delegate_binding_.is_bound()); | 27 DCHECK(!item_delegate_binding_.is_bound()); |
| 28 ash::mojom::ShelfItemDelegateAssociatedPtrInfo ptr_info; | 28 ash::mojom::ShelfItemDelegateAssociatedPtrInfo ptr_info; |
| 29 item_delegate_binding_.Bind(&ptr_info, associated_group); | 29 item_delegate_binding_.Bind(&ptr_info, associated_group); |
| 30 return ptr_info; | 30 return ptr_info; |
| 31 } | 31 } |
| 32 | 32 |
| 33 private: | 33 private: |
| 34 // ash::mojom::ShelfItemDelegate: | 34 // ash::mojom::ShelfItemDelegate: |
| 35 void LaunchItem() override { | 35 void LaunchItem() override { |
| 36 controller_->LaunchApp(app_id_, ash::LAUNCH_FROM_UNKNOWN, ui::EF_NONE); | 36 controller_->LaunchApp(app_id_, "", ash::LAUNCH_FROM_UNKNOWN, ui::EF_NONE); |
| 37 } | 37 } |
| 38 void ExecuteCommand(uint32_t command_id, int32_t event_flags) override { | 38 void ExecuteCommand(uint32_t command_id, int32_t event_flags) override { |
| 39 NOTIMPLEMENTED(); | 39 NOTIMPLEMENTED(); |
| 40 } | 40 } |
| 41 void ItemPinned() override { NOTIMPLEMENTED(); } | 41 void ItemPinned() override { NOTIMPLEMENTED(); } |
| 42 void ItemUnpinned() override { NOTIMPLEMENTED(); } | 42 void ItemUnpinned() override { NOTIMPLEMENTED(); } |
| 43 void ItemReordered(uint32_t order) override { NOTIMPLEMENTED(); } | 43 void ItemReordered(uint32_t order) override { NOTIMPLEMENTED(); } |
| 44 | 44 |
| 45 std::string app_id_; | 45 std::string app_id_; |
| 46 mojo::AssociatedBinding<ash::mojom::ShelfItemDelegate> item_delegate_binding_; | 46 mojo::AssociatedBinding<ash::mojom::ShelfItemDelegate> item_delegate_binding_; |
| (...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 310 app_id_to_item_delegate_.insert( | 310 app_id_to_item_delegate_.insert( |
| 311 std::make_pair(app_id, std::move(delegate))); | 311 std::make_pair(app_id, std::move(delegate))); |
| 312 | 312 |
| 313 AppIconLoader* app_icon_loader = GetAppIconLoaderForApp(app_id); | 313 AppIconLoader* app_icon_loader = GetAppIconLoaderForApp(app_id); |
| 314 if (app_icon_loader) { | 314 if (app_icon_loader) { |
| 315 app_icon_loader->FetchImage(app_id); | 315 app_icon_loader->FetchImage(app_id); |
| 316 app_icon_loader->UpdateImage(app_id); | 316 app_icon_loader->UpdateImage(app_id); |
| 317 } | 317 } |
| 318 } | 318 } |
| 319 } | 319 } |
| OLD | NEW |