mash: Support ShelfWindowWatcher via ShelfItem properties.

chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.cc

 // Copyright 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/ui/ash/launcher/multi_profile_browser_status_monitor.h"
 
 #include "ash/aura/wm_window_aura.h"
 #include "ash/common/shelf/shelf_item_types.h"
+#include "ash/common/wm_window_observer.h"
 #include "ash/common/wm_window_property.h"
-#include "ash/resources/grit/ash_resources.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/settings_window_manager.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/grit/generated_resources.h"
-#include "components/strings/grit/components_strings.h"
-#include "ui/base/l10n/l10n_util.h"
 
 MultiProfileBrowserStatusMonitor::MultiProfileBrowserStatusMonitor(
     ChromeLauncherController* launcher_controller)
     : BrowserStatusMonitor(launcher_controller),
       launcher_controller_(launcher_controller) {
 }
 
 MultiProfileBrowserStatusMonitor::~MultiProfileBrowserStatusMonitor() {
 }
 
 void MultiProfileBrowserStatusMonitor::ActiveUserChanged(
     const std::string& user_email) {
   // Handle windowed apps.
   for (AppList::iterator it = app_list_.begin(); it != app_list_.end(); ++it) {
     bool owned = multi_user_util::IsProfileFromActiveUser((*it)->profile());
     bool shown = IsV1AppInShelf(*it);
     if (owned && !shown)
       ConnectV1AppToLauncher(*it);
     else if (!owned && shown)
       DisconnectV1AppFromLauncher(*it);
   }
 
   // Handle apps in browser tabs: Add the new applications.
   BrowserList* browser_list = BrowserList::GetInstance();
 
   // Remove old (tabbed V1) applications.
-  for (BrowserList::const_iterator it = browser_list->begin();
-       it != browser_list->end(); ++it) {
-    Browser* browser = *it;
+  for (Browser* browser : *browser_list) {
     if (!browser->is_app() &&
         browser->is_type_tabbed() &&
         !multi_user_util::IsProfileFromActiveUser(browser->profile())) {
       for (int i = 0; i < browser->tab_strip_model()->count(); ++i) {
         launcher_controller_->UpdateAppState(
             browser->tab_strip_model()->GetWebContentsAt(i),
             ChromeLauncherController::APP_STATE_REMOVED);
       }
     }
   }
 
   // Handle apps in browser tabs: Add new (tabbed V1) applications.
-  for (BrowserList::const_iterator it = browser_list->begin();
-       it != browser_list->end(); ++it) {
-    Browser* browser = *it;
+  for (Browser* browser : *browser_list) {
     if (!browser->is_app() &&
         browser->is_type_tabbed() &&
         multi_user_util::IsProfileFromActiveUser(browser->profile())) {
       int active_index = browser->tab_strip_model()->active_index();
       for (int i = 0; i < browser->tab_strip_model()->count(); ++i) {
         launcher_controller_->UpdateAppState(
             browser->tab_strip_model()->GetWebContentsAt(i),
             browser->window()->IsActive() && i == active_index ?
                 ChromeLauncherController::APP_STATE_WINDOW_ACTIVE :
                 ChromeLauncherController::APP_STATE_INACTIVE);
       }
     }
   }
 
-  // Remove settings window icons not associated with this profile and create
-  // icons for windows associated with the current profile.
-  for (BrowserList::const_iterator it = browser_list->begin();
-       it != browser_list->end(); ++it) {
-    Browser* browser = *it;
-    if (!chrome::SettingsWindowManager::GetInstance()->IsSettingsBrowser(
+  // Hide settings window shelf items not associated with this profile and
+  // restore items for windows associated with the current profile.
+  for (Browser* browser : *browser_list) {
+    if (chrome::SettingsWindowManager::GetInstance()->IsSettingsBrowser(
             browser)) {
-      continue;
-    }
-    aura::Window* aura_window = browser->window()->GetNativeWindow();
-    if (multi_user_util::IsProfileFromActiveUser(browser->profile())) {
-      ash::ShelfItemDetails item_details;
-      item_details.type = ash::TYPE_DIALOG;
-      item_details.image_resource_id = IDR_ASH_SHELF_ICON_SETTINGS;
-      item_details.title = l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE);
-      ash::WmWindowAura::Get(aura_window)->SetShelfItemDetails(item_details);
-    } else {
-      ash::WmWindowAura::Get(aura_window)->ClearShelfItemDetails();
+      aura::Window* aura_window = browser->window()->GetNativeWindow();
+      ash::WmWindowAura::Get(aura_window)
+          ->SetIntProperty(
+              ash::WmWindowProperty::SHELF_ITEM_TYPE,

[James Cook, 2016/09/29 02:49:46]

Wait, don't we also need to set the icon ID when you set TYPE_DIALOG?

[msw, 2016/09/29 06:23:36]

No, this is effectively just 'hiding' and 'showing' the item. The icon resource
id property value (and the window title) supplied by
BrowserStatusMonitor::SettingsWindowObserver are unchanged. I DCHECK'ed the
values here in an intermediary (but not uploaded?) patchset, but it doesn't seem
entirely worthwhile to include grit files and string utils just to dcheck those
values here.

+              multi_user_util::IsProfileFromActiveUser(browser->profile())
+                  ? ash::TYPE_DIALOG
+                  : ash::TYPE_UNDEFINED);
     }
   }
 
   // Update the browser state since some of the removals / adds above might have
   // had an impact on the browser item.
   UpdateBrowserItemState();
 }
 
 void MultiProfileBrowserStatusMonitor::AddV1AppToShelf(Browser* browser) {
   DCHECK(browser->is_type_popup() && browser->is_app());
@@ skipping 27 matching lines @@
 
 void MultiProfileBrowserStatusMonitor::DisconnectV1AppFromLauncher(
     Browser* browser) {
   // Removing a V1 app from the launcher requires to remove the content and
   // the launcher item.
   launcher_controller_->UpdateAppState(
       browser->tab_strip_model()->GetActiveWebContents(),
       ChromeLauncherController::APP_STATE_REMOVED);
   BrowserStatusMonitor::RemoveV1AppFromShelf(browser);
 }