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

Unified Diff: ash/wm/overview/window_selector_panels.cc

Issue 331643004: Update the window labels if they change in overview mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 6 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: ash/wm/overview/window_selector_panels.cc
diff --git a/ash/wm/overview/window_selector_panels.cc b/ash/wm/overview/window_selector_panels.cc
index e936f929e31cd702e530efd0845c66b074665309..bc4d4590415cf219da5bbf66c71885c688491132 100644
--- a/ash/wm/overview/window_selector_panels.cc
+++ b/ash/wm/overview/window_selector_panels.cc
@@ -92,10 +92,15 @@ WindowSelectorPanels::~WindowSelectorPanels() {
static_cast<PanelLayoutManager*>(
Shell::GetContainer(panels_root_window_, kShellWindowId_PanelContainer)->
layout_manager())->SetShowCalloutWidgets(true);
+ if (!transform_windows_.empty())
+ transform_windows_[0]->window()->RemoveObserver(this);
}
void WindowSelectorPanels::AddWindow(aura::Window* window) {
DCHECK(window->GetRootWindow() == panels_root_window_);
+ // If this is the panel we use to get the label text, observe it for changes.
+ if (transform_windows_.empty())
+ window->AddObserver(this);
transform_windows_.push_back(new ScopedTransformPanelWindow(window));
}
@@ -139,6 +144,11 @@ void WindowSelectorPanels::RemoveWindow(const aura::Window* window) {
for (WindowList::iterator iter = transform_windows_.begin();
iter != transform_windows_.end(); ++iter) {
if ((*iter)->window() == window) {
+ if (window == transform_windows_[0]->window()) {
tdanderson 2014/06/20 22:33:23 Brief comment to explain what you're doing in line
Nina 2014/06/20 23:02:37 Done.
+ transform_windows_[0]->window()->RemoveObserver(this);
+ if (transform_windows_.size() > 1)
+ transform_windows_[1]->window()->AddObserver(this);
+ }
(*iter)->OnWindowDestroyed();
transform_windows_.erase(iter);
break;

Powered by Google App Engine
This is Rietveld 408576698