| Index: chrome/browser/ui/ash/launcher/settings_window_observer.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/settings_window_observer.cc b/chrome/browser/ui/ash/launcher/settings_window_observer.cc
|
| index c061c7e315ad1da7d828ceee80468665c55f9bfd..6dcf415b1c07f54166a3930602ee44038ba19959 100644
|
| --- a/chrome/browser/ui/ash/launcher/settings_window_observer.cc
|
| +++ b/chrome/browser/ui/ash/launcher/settings_window_observer.cc
|
| @@ -55,7 +55,8 @@ void SettingsWindowObserver::OnNewSettingsWindow(Browser* settings_browser) {
|
| // An app id for settings windows, also used to identify the shelf item.
|
| // Generated as crx_file::id_util::GenerateId("org.chromium.settings_ui")
|
| static constexpr char kSettingsId[] = "dhnmfjegnohoakobpikffnelcemaplkm";
|
| - window->SetProperty(ash::kShelfIDKey, new ash::ShelfID(kSettingsId));
|
| + const ash::ShelfID shelf_id(kSettingsId);
|
| + window->SetProperty(ash::kShelfIDKey, new std::string(shelf_id.Serialize()));
|
| 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.
|
|
|