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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.h

Issue 1951523002: Add basic support for launching mash shelf pinned apps. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Only LaunchItem with no windows; otherwise kNoAction (for CreateApplicationMenu). Created 4 years, 8 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/chrome_mash_shelf_controller.h
diff --git a/chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.h b/chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.h
index 198f63d8f513162aedc6fcd247c69654cdcb789b..532110e5dbb52638bf606c12efef094292d482ce 100644
--- a/chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.h
+++ b/chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.h
@@ -11,6 +11,7 @@
#include <vector>
#include "chrome/browser/ui/app_icon_loader.h"
+#include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h"
#include "mash/shelf/public/interfaces/shelf.mojom.h"
#include "mojo/public/cpp/bindings/associated_binding.h"
@@ -28,6 +29,8 @@ class ChromeMashShelfController : public mash::shelf::mojom::ShelfObserver,
// Returns the single ChromeMashShelfController instance.
static ChromeMashShelfController* instance() { return instance_; }
+ void LaunchItem(const std::string& app_id);
+
private:
ChromeMashShelfController();
@@ -48,6 +51,7 @@ class ChromeMashShelfController : public mash::shelf::mojom::ShelfObserver,
static ChromeMashShelfController* instance_;
+ LauncherControllerHelper helper_;
mash::shelf::mojom::ShelfControllerPtr shelf_controller_;
mojo::AssociatedBinding<mash::shelf::mojom::ShelfObserver> observer_binding_;
std::map<std::string, std::unique_ptr<ChromeShelfItemDelegate>>

Powered by Google App Engine
This is Rietveld 408576698