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 c7fa01abeea8768ab2cb4fb4a457deb9062a13b7..2623064381802260507439597798d2f0cdc0790f 100644 |
--- a/chrome/browser/ui/ash/launcher/settings_window_observer.cc |
+++ b/chrome/browser/ui/ash/launcher/settings_window_observer.cc |
@@ -52,6 +52,9 @@ SettingsWindowObserver::~SettingsWindowObserver() { |
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 const char kSettingsAppID[] = "Settings"; |
James Cook
2017/05/04 16:38:49
Are all of "static constexpr const" needed here?
msw
2017/05/04 19:05:58
Done.
|
+ window->SetProperty(ash::kShelfIDKey, new ash::ShelfID(kSettingsAppID)); |
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. |