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

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

Issue 2790803002: mash: Remove V1 app shelf item locking; monitor running status instead. (Closed)
Patch Set: spelling Created 3 years, 9 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 5e163771c4d76cd6da665d514fcdbaf66850482d..7b7e3dd65aaeef4dd623e3644f287ccc9b491162 100644
--- a/chrome/browser/ui/ash/launcher/launcher_item_controller.h
+++ b/chrome/browser/ui/ash/launcher/launcher_item_controller.h
@@ -36,14 +36,6 @@ class LauncherItemController : public ash::mojom::ShelfItemDelegate {
return launcher_controller_;
}
- // Lock this item to the launcher without being pinned (windowed v1 apps).
- void lock() { locked_++; }
- void unlock() {
- DCHECK(locked_);
- locked_--;
- }
- bool locked() const { return locked_ > 0; }
-
bool image_set_by_controller() const { return image_set_by_controller_; }
void set_image_set_by_controller(bool image_set_by_controller) {
image_set_by_controller_ = image_set_by_controller;
@@ -68,11 +60,6 @@ class LauncherItemController : public ash::mojom::ShelfItemDelegate {
ChromeLauncherController* launcher_controller_;
- // The lock counter which tells the launcher if the item can be removed from
- // the launcher (0) or not (>0). It is being used for windowed V1
- // applications.
- int locked_;
-
// Set to true if the launcher item image has been set by the controller.
bool image_set_by_controller_;

Powered by Google App Engine
This is Rietveld 408576698