Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(138)

Unified Diff: chrome/browser/ui/ash/launcher/settings_window_observer.cc

Issue 2878133002: mash: Serialize ShelfIDs for property conversion and transport. (Closed)
Patch Set: Address comments. Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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.

Powered by Google App Engine
This is Rietveld 408576698