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

Side by Side Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_mus.cc

Issue 2684723003: Remove LauncherItemController::Launch, cleanup. (Closed)
Patch Set: Use AppLauncherId 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 unified diff | Download patch
OLDNEW
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 "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/profiles/profile_manager.h" 10 #include "chrome/browser/profiles/profile_manager.h"
(...skipping 17 matching lines...) Expand all
28 mojo::AssociatedGroup* associated_group) { 28 mojo::AssociatedGroup* associated_group) {
29 DCHECK(!item_delegate_binding_.is_bound()); 29 DCHECK(!item_delegate_binding_.is_bound());
30 ash::mojom::ShelfItemDelegateAssociatedPtrInfo ptr_info; 30 ash::mojom::ShelfItemDelegateAssociatedPtrInfo ptr_info;
31 item_delegate_binding_.Bind(&ptr_info, associated_group); 31 item_delegate_binding_.Bind(&ptr_info, associated_group);
32 return ptr_info; 32 return ptr_info;
33 } 33 }
34 34
35 private: 35 private:
36 // ash::mojom::ShelfItemDelegate: 36 // ash::mojom::ShelfItemDelegate:
37 void LaunchItem() override { 37 void LaunchItem() override {
38 controller_->LaunchApp(app_id_, ash::LAUNCH_FROM_UNKNOWN, ui::EF_NONE); 38 controller_->LaunchApp(ash::launcher::AppLauncherId(app_id_),
39 ash::LAUNCH_FROM_UNKNOWN, ui::EF_NONE);
39 } 40 }
40 void ExecuteCommand(uint32_t command_id, int32_t event_flags) override { 41 void ExecuteCommand(uint32_t command_id, int32_t event_flags) override {
41 NOTIMPLEMENTED(); 42 NOTIMPLEMENTED();
42 } 43 }
43 void ItemPinned() override { NOTIMPLEMENTED(); } 44 void ItemPinned() override { NOTIMPLEMENTED(); }
44 void ItemUnpinned() override { NOTIMPLEMENTED(); } 45 void ItemUnpinned() override { NOTIMPLEMENTED(); }
45 void ItemReordered(uint32_t order) override { NOTIMPLEMENTED(); } 46 void ItemReordered(uint32_t order) override { NOTIMPLEMENTED(); }
46 47
47 std::string app_id_; 48 std::string app_id_;
48 mojo::AssociatedBinding<ash::mojom::ShelfItemDelegate> item_delegate_binding_; 49 mojo::AssociatedBinding<ash::mojom::ShelfItemDelegate> item_delegate_binding_;
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 app_id_to_item_delegate_.insert( 299 app_id_to_item_delegate_.insert(
299 std::make_pair(app_id, std::move(delegate))); 300 std::make_pair(app_id, std::move(delegate)));
300 301
301 AppIconLoader* app_icon_loader = GetAppIconLoaderForApp(app_id); 302 AppIconLoader* app_icon_loader = GetAppIconLoaderForApp(app_id);
302 if (app_icon_loader) { 303 if (app_icon_loader) {
303 app_icon_loader->FetchImage(app_id); 304 app_icon_loader->FetchImage(app_id);
304 app_icon_loader->UpdateImage(app_id); 305 app_icon_loader->UpdateImage(app_id);
305 } 306 }
306 } 307 }
307 } 308 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698