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

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

Issue 2869473002: Fix crash on openning settings when DCHECK is on. (Closed)
Patch Set: use new id for app list 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 83ed6871f0dd6c243e9ef4655a1992a1b1df999e..c061c7e315ad1da7d828ceee80468665c55f9bfd 100644
--- a/chrome/browser/ui/ash/launcher/settings_window_observer.cc
+++ b/chrome/browser/ui/ash/launcher/settings_window_observer.cc
@@ -53,7 +53,8 @@ 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";
+ // Generated as crx_file::id_util::GenerateId("org.chromium.settings_ui")
+ static constexpr char kSettingsId[] = "dhnmfjegnohoakobpikffnelcemaplkm";
window->SetProperty(ash::kShelfIDKey, new ash::ShelfID(kSettingsId));
window->SetProperty<int>(ash::kShelfItemTypeKey, ash::TYPE_DIALOG);
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
« no previous file with comments | « chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc ('k') | chrome/browser/ui/views/task_manager_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698