Don't track windows that were interacted (restored/minimized) by user while wallpaper picker applic…

chrome/browser/chromeos/extensions/wallpaper_private_api.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/extensions/wallpaper_private_api.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 130 matching lines @@
   // Unminimize all the stored windows for |user_id_hash|.
   void RestoreMinimizedWindows(const std::string& user_id_hash);
 
   // Remove the observer from |window| if |window| is no longer referenced in
   // user_id_hash_window_list_map_.
   void RemoveObserverIfUnreferenced(aura::Window* window);
 
   // aura::WindowObserver overrides.
   void OnWindowDestroyed(aura::Window* window) override;
 
+  // aura::WindowObserver overrides.
+  void OnWindowStackingChanged(aura::Window* window) override;
+
   // Map of user id hash and associated list of minimized windows.
   UserIDHashWindowListMap user_id_hash_window_list_map_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowStateManager);
 };
 
 // static
 WindowStateManager* g_window_state_manager = NULL;
 
 // static
@@ skipping 35 matching lines @@
 
   std::vector<aura::Window*> windows = ash::Shell::GetInstance()->
       mru_window_tracker()->BuildWindowListIgnoreModal();
 
   for (std::vector<aura::Window*>::iterator iter = windows.begin();
        iter != windows.end(); ++iter) {
     // Ignore active window and minimized windows.
     if (*iter == active_window || ash::wm::GetWindowState(*iter)->IsMinimized())
       continue;
 
-    // TODO(bshe): Add WindowStateObserver too. http://crbug.com/323252
     if (!(*iter)->HasObserver(this))
       (*iter)->AddObserver(this);
 
     results->insert(*iter);
     ash::wm::GetWindowState(*iter)->Minimize();
   }
 }
 
 void WindowStateManager::RestoreMinimizedWindows(
     const std::string& user_id_hash) {
@@ skipping 30 matching lines @@
 
 void WindowStateManager::OnWindowDestroyed(aura::Window* window) {
   for (UserIDHashWindowListMap::iterator iter =
            user_id_hash_window_list_map_.begin();
        iter != user_id_hash_window_list_map_.end();
        ++iter) {
     iter->second.erase(window);
   }
 }
 
+void WindowStateManager::OnWindowStackingChanged(aura::Window* window) {

[bshe, 2015/03/24 17:21:42]

I am not familiar with this function and when will it be called. As long as it
called when the window state changed, it should be fine. You probably want to
add another reviewer who is familiar with this to take a look.

+  // If user interacted with the |window| while wallpaper picker is opening,
+  // removes the |window| from observed list.
+  for (UserIDHashWindowListMap::iterator iter =

[bshe, 2015/03/24 17:21:41]

you can probably use auto here since it is allowed.

+           user_id_hash_window_list_map_.begin();
+       iter != user_id_hash_window_list_map_.end(); ++iter) {
+    if (iter->second.find(window) != iter->second.end())

[bshe, 2015/03/24 17:21:41]

you can directly call erase here. If it's not found, erase should be a noop.

+      iter->second.erase(window);
+  }
+  window->RemoveObserver(this);
+}
+
 }  // namespace
 
 bool WallpaperPrivateGetStringsFunction::RunSync() {
   base::DictionaryValue* dict = new base::DictionaryValue();
   SetResult(dict);
 
 #define SET_STRING(id, idr) \
   dict->SetString(id, l10n_util::GetStringUTF16(idr))
   SET_STRING("webFontFamily", IDS_WEB_FONT_FAMILY);
   SET_STRING("webFontSize", IDS_WEB_FONT_SIZE);
@@ skipping 649 matching lines @@
                  this, file_list));
 }
 
 void WallpaperPrivateGetOfflineWallpaperListFunction::OnComplete(
     const std::vector<std::string>& file_list) {
   base::ListValue* results = new base::ListValue();
   results->AppendStrings(file_list);
   SetResult(results);
   SendResponse(true);
 }