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

Side by Side Diff: ash/common/shelf/shelf_window_watcher.h

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 unified diff | Download patch
« no previous file with comments | « ash/common/shelf/shelf_view.cc ('k') | ash/common/shelf/shelf_window_watcher.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_COMMON_SHELF_SHELF_WINDOW_WATCHER_H_ 5 #ifndef ASH_COMMON_SHELF_SHELF_WINDOW_WATCHER_H_
6 #define ASH_COMMON_SHELF_SHELF_WINDOW_WATCHER_H_ 6 #define ASH_COMMON_SHELF_SHELF_WINDOW_WATCHER_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "ash/common/wm_activation_observer.h" 10 #include "ash/common/wm_activation_observer.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 public: 54 public:
55 explicit UserWindowObserver(ShelfWindowWatcher* window_watcher); 55 explicit UserWindowObserver(ShelfWindowWatcher* window_watcher);
56 ~UserWindowObserver() override; 56 ~UserWindowObserver() override;
57 57
58 private: 58 private:
59 // WmWindowObserver: 59 // WmWindowObserver:
60 void OnWindowPropertyChanged(WmWindow* window, 60 void OnWindowPropertyChanged(WmWindow* window,
61 WmWindowProperty property) override; 61 WmWindowProperty property) override;
62 void OnWindowDestroying(WmWindow* window) override; 62 void OnWindowDestroying(WmWindow* window) override;
63 void OnWindowVisibilityChanged(WmWindow* window, bool visible) override; 63 void OnWindowVisibilityChanged(WmWindow* window, bool visible) override;
64 void OnWindowTitleChanged(WmWindow* window) override;
64 65
65 ShelfWindowWatcher* window_watcher_; 66 ShelfWindowWatcher* window_watcher_;
66 67
67 DISALLOW_COPY_AND_ASSIGN(UserWindowObserver); 68 DISALLOW_COPY_AND_ASSIGN(UserWindowObserver);
68 }; 69 };
69 70
70 // Creates a ShelfItem for |window|. 71 // Creates a ShelfItem for |window|.
71 void AddShelfItem(WmWindow* window); 72 void AddShelfItem(WmWindow* window);
72 73
73 // Removes a ShelfItem for |window|. 74 // Removes a ShelfItem for |window|.
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 110
110 // The set of windows with shelf items managed by this ShelfWindowWatcher. 111 // The set of windows with shelf items managed by this ShelfWindowWatcher.
111 std::set<WmWindow*> user_windows_with_items_; 112 std::set<WmWindow*> user_windows_with_items_;
112 113
113 DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcher); 114 DISALLOW_COPY_AND_ASSIGN(ShelfWindowWatcher);
114 }; 115 };
115 116
116 } // namespace ash 117 } // namespace ash
117 118
118 #endif // ASH_COMMON_SHELF_SHELF_WINDOW_WATCHER_H_ 119 #endif // ASH_COMMON_SHELF_SHELF_WINDOW_WATCHER_H_
OLDNEW
« no previous file with comments | « ash/common/shelf/shelf_view.cc ('k') | ash/common/shelf/shelf_window_watcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698