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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc

Issue 2462753002: Use Ash's ShelfWindowWatcher for app panel windows. (Closed)
Patch Set: Add ShelfWindowWatcherTest, remove ChromeLauncherControllerImplTest panel use. Created 4 years, 1 month 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_launcher_controller_impl.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
index 70111f5b02b7542f35913398746e103d5e1fb5fb..257cbf124b8d3512ffb09a4da4aca3a2be964300 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_impl.cc
@@ -449,17 +449,15 @@ void ChromeLauncherControllerImpl::Launch(ash::ShelfID id, int event_flags) {
}
void ChromeLauncherControllerImpl::Close(ash::ShelfID id) {
- LauncherItemController* controller = GetLauncherItemController(id);
- if (!controller)
+ ash::ShelfItemDelegate* delegate = model_->GetShelfItemDelegate(id);
+ if (!delegate)
return; // May happen if menu closed.
- controller->Close();
+ delegate->Close();
}
bool ChromeLauncherControllerImpl::IsOpen(ash::ShelfID id) {
- LauncherItemController* controller = GetLauncherItemController(id);
- if (!controller)
- return false;
- return controller->IsOpen();
+ ash::ShelfItemDelegate* delegate = model_->GetShelfItemDelegate(id);
+ return delegate && delegate->IsOpen();
}
bool ChromeLauncherControllerImpl::IsPlatformApp(ash::ShelfID id) {

Powered by Google App Engine
This is Rietveld 408576698