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

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

Issue 2290603002: Enhance chrome.app.window API for shelf integration with pinning support (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: LauncherItemController Unit Tests Fix after Rebase Created 4 years, 3 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/launcher_item_controller.h
diff --git a/chrome/browser/ui/ash/launcher/launcher_item_controller.h b/chrome/browser/ui/ash/launcher/launcher_item_controller.h
index 65db56634dff1b990929fd9d79bc75431dfcef5c..b45ffde0c06749c50bd3f21eda22a2c782ae5571 100644
--- a/chrome/browser/ui/ash/launcher/launcher_item_controller.h
+++ b/chrome/browser/ui/ash/launcher/launcher_item_controller.h
@@ -42,6 +42,7 @@ class LauncherItemController : public ash::ShelfItemDelegate {
LauncherItemController(Type type,
const std::string& app_id,
+ const std::string& launch_id,
ChromeLauncherController* launcher_controller);
~LauncherItemController() override;
@@ -49,6 +50,7 @@ class LauncherItemController : public ash::ShelfItemDelegate {
ash::ShelfID shelf_id() const { return shelf_id_; }
void set_shelf_id(ash::ShelfID id) { shelf_id_ = id; }
const std::string& app_id() const { return app_id_; }
+ const std::string& launch_id() const { return launch_id_; }
ChromeLauncherController* launcher_controller() const {
return launcher_controller_;
}
@@ -90,6 +92,11 @@ class LauncherItemController : public ash::ShelfItemDelegate {
const Type type_;
// App id will be empty if there is no app associated with the window.
const std::string app_id_;
+ // An id that can be passed to an app when launched in order to support
+ // multiple shelf items per app. This id is used together with the app_id to
+ // uniquely identify each shelf item that has the same app_id.
+ const std::string launch_id_;
+ // A unique id assigned by the shelf model for the shelf item.
ash::ShelfID shelf_id_;
ChromeLauncherController* launcher_controller_;

Powered by Google App Engine
This is Rietveld 408576698