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

Unified Diff: ash/common/shelf/shelf_window_watcher.cc

Issue 2627533002: Replace ShelfItemDelegate::GetTitle() with ShelfItem::title. (Closed)
Patch Set: Address comments. Created 3 years, 11 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
« no previous file with comments | « ash/common/shelf/shelf_window_watcher.h ('k') | ash/common/shelf/shelf_window_watcher_item_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/shelf/shelf_window_watcher.cc
diff --git a/ash/common/shelf/shelf_window_watcher.cc b/ash/common/shelf/shelf_window_watcher.cc
index b4087c29f599ce7722de355cdd2e80497d0e747b..50f369969115571868079a582fd69776e3eefa4f 100644
--- a/ash/common/shelf/shelf_window_watcher.cc
+++ b/ash/common/shelf/shelf_window_watcher.cc
@@ -39,6 +39,8 @@ void UpdateShelfItemForWindow(ShelfItem* item, WmWindow* window) {
if (item->image.isNull())
item->image = window->GetWindowIcon();
+ item->title = window->GetTitle();
+
// Do not show tooltips for visible attached app panel windows.
item->shows_tooltip =
item->type != TYPE_APP_PANEL || !window->IsVisible() ||
@@ -109,6 +111,11 @@ void ShelfWindowWatcher::UserWindowObserver::OnWindowVisibilityChanged(
window_watcher_->OnUserWindowPropertyChanged(window);
}
+void ShelfWindowWatcher::UserWindowObserver::OnWindowTitleChanged(
+ WmWindow* window) {
+ window_watcher_->OnUserWindowPropertyChanged(window);
+}
+
////////////////////////////////////////////////////////////////////////////////
ShelfWindowWatcher::ShelfWindowWatcher(ShelfModel* model)
« no previous file with comments | « ash/common/shelf/shelf_window_watcher.h ('k') | ash/common/shelf/shelf_window_watcher_item_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698