mash: Replace int ShelfIDs with AppLaunchID strings.

chrome/browser/ui/ash/launcher/settings_window_observer.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 "chrome/browser/ui/ash/launcher/settings_window_observer.h"
 
 #include "ash/public/cpp/shelf_item.h"
 #include "ash/public/cpp/window_properties.h"
 #include "ash/resources/grit/ash_resources.h"
 #include "base/memory/ptr_util.h"
@@ skipping 34 matching lines @@
   chrome::SettingsWindowManager::GetInstance()->AddObserver(this);
 }
 
 SettingsWindowObserver::~SettingsWindowObserver() {
   chrome::SettingsWindowManager::GetInstance()->RemoveObserver(this);
 }
 
 void SettingsWindowObserver::OnNewSettingsWindow(Browser* settings_browser) {
   aura::Window* window = settings_browser->window()->GetNativeWindow();
   window->SetTitle(l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE));
+  // An app id for settings windows, also used to identify the shelf item.
+  static constexpr char kSettingsId[] = "SettingsId";
+  window->SetProperty(ash::kShelfIDKey, new ash::ShelfID(kSettingsId));
   window->SetProperty<int>(ash::kShelfItemTypeKey, ash::TYPE_DIALOG);
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   // The new gfx::ImageSkia instance is owned by the window itself.
   window->SetProperty(
       aura::client::kWindowIconKey,
       new gfx::ImageSkia(*rb.GetImageSkiaNamed(IDR_ASH_SHELF_ICON_SETTINGS)));
   aura_window_tracker_->Add(window);
 }