mash: Fix shelf window property use in Chrome.

ash/mus/bridge/wm_window_mus.cc

 // Copyright 2016 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 "ash/mus/bridge/wm_window_mus.h"
 
 #include "ash/common/shelf/shelf_item_types.h"
 #include "ash/common/wm/container_finder.h"
 #include "ash/common/wm/window_positioning_utils.h"
 #include "ash/common/wm/window_state.h"
@@ skipping 82 matching lines @@
     case ui::SHOW_STATE_FULLSCREEN:
       return ui::mojom::ShowState::FULLSCREEN;
     case ui::SHOW_STATE_DOCKED:
       return ui::mojom::ShowState::DOCKED;
     default:
       break;
   }
   return ui::mojom::ShowState::DEFAULT;
 }
 
+// Returns the WmWindowProperty enum value for the given ui::Window key name.
+WmWindowProperty WmWindowPropertyFromUI(const std::string& ui_window_key) {
+  if (ui_window_key == ui::mojom::WindowManager::kAlwaysOnTop_Property)
+    return WmWindowProperty::ALWAYS_ON_TOP;
+  if (ui_window_key == ui::mojom::WindowManager::kShelfIconResourceId_Property)
+    return WmWindowProperty::SHELF_ICON_RESOURCE_ID;
+  if (ui_window_key == ui::mojom::WindowManager::kShelfItemType_Property)
+    return WmWindowProperty::SHELF_ITEM_TYPE;
+  return WmWindowProperty::INVALID_PROPERTY;
+}
+
 }  // namespace
 
 WmWindowMus::WmWindowMus(ui::Window* window)
     : window_(window),
       // Matches aura, see aura::Window for details.
       observers_(base::ObserverList<WmWindowObserver>::NOTIFY_EXISTING_ONLY) {
   window_->AddObserver(this);
   window_->SetLocalProperty(kWmWindowKey, this);
   window_state_.reset(new WindowStateMus(this));
 }
@@ skipping 289 matching lines @@
       return window_->GetSharedProperty<int>(
           ui::mojom::WindowManager::kShelfIconResourceId_Property);
     }
     // Mash provides a default shelf icon image.
     // TODO(msw): Support icon resource ids and bitmaps:
     // mojo::Array<uint8_t> app_icon = GetWindowAppIcon(window_);
     return IDR_DEFAULT_FAVICON;
   }
 
   if (key == WmWindowProperty::SHELF_ID) {
-    NOTIMPLEMENTED();
+    if (window_->HasSharedProperty(
+            ui::mojom::WindowManager::kShelfId_Property)) {
+      return window_->GetSharedProperty<int>(
+          ui::mojom::WindowManager::kShelfId_Property);
+    }
+
     return kInvalidShelfID;
   }
 
   if (key == WmWindowProperty::SHELF_ITEM_TYPE) {
     if (window_->HasSharedProperty(
             ui::mojom::WindowManager::kShelfItemType_Property)) {
       return window_->GetSharedProperty<int>(
           ui::mojom::WindowManager::kShelfItemType_Property);
     }
     // Mash provides a default shelf item type for non-ignored windows.
@@ skipping 12 matching lines @@
 }
 
 void WmWindowMus::SetIntProperty(WmWindowProperty key, int value) {
   if (key == WmWindowProperty::SHELF_ICON_RESOURCE_ID) {
     window_->SetSharedProperty<int>(
         ui::mojom::WindowManager::kShelfIconResourceId_Property, value);
     return;
   }
 
   if (key == WmWindowProperty::SHELF_ID) {
-    NOTIMPLEMENTED();
+    window_->SetSharedProperty<int>(ui::mojom::WindowManager::kShelfId_Property,
+                                    value);
     return;
   }
 
   if (key == WmWindowProperty::SHELF_ITEM_TYPE) {
     window_->SetSharedProperty<int>(
         ui::mojom::WindowManager::kShelfItemType_Property, value);
     return;
   }
 
   if (key == WmWindowProperty::TOP_VIEW_INSET) {
@@ skipping 471 matching lines @@
 
 void WmWindowMus::OnWindowSharedPropertyChanged(
     ui::Window* window,
     const std::string& name,
     const std::vector<uint8_t>* old_data,
     const std::vector<uint8_t>* new_data) {
   if (name == ui::mojom::WindowManager::kShowState_Property) {
     GetWindowState()->OnWindowShowStateChanged();
     return;
   }
-  if (name == ui::mojom::WindowManager::kAlwaysOnTop_Property) {
-    FOR_EACH_OBSERVER(
-        WmWindowObserver, observers_,
-        OnWindowPropertyChanged(this, WmWindowProperty::ALWAYS_ON_TOP));
+  if (name == ui::mojom::WindowManager::kWindowTitle_Property) {
+    FOR_EACH_OBSERVER(WmWindowObserver, observers_, OnWindowTitleChanged(this));
     return;
   }
 
+  // Notify WmWindowObserver of certain white-listed property changes.
+  WmWindowProperty wm_property = WmWindowPropertyFromUI(name);
+  if (wm_property != WmWindowProperty::INVALID_PROPERTY) {
+    FOR_EACH_OBSERVER(WmWindowObserver, observers_,
+                      OnWindowPropertyChanged(this, wm_property));
+    return;
+  }
+
   // Deal with snap to pixel.
   NOTIMPLEMENTED();
 }
 
 void WmWindowMus::OnWindowBoundsChanged(ui::Window* window,
                                         const gfx::Rect& old_bounds,
                                         const gfx::Rect& new_bounds) {
   FOR_EACH_OBSERVER(WmWindowObserver, observers_,
                     OnWindowBoundsChanged(this, old_bounds, new_bounds));
 }
@@ skipping 24 matching lines @@
 }
 
 void WmWindowMus::OnTransientChildRemoved(ui::Window* window,
                                           ui::Window* transient) {
   FOR_EACH_OBSERVER(WmTransientWindowObserver, transient_observers_,
                     OnTransientChildRemoved(this, Get(transient)));
 }
 
 }  // namespace mus
 }  // namespace ash