| Index: chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc
|
| diff --git a/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc b/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc
|
| index ec551c1f673dacef30952980708ca23d3f731867..d0e22eaeb0b1adeaf578f8610ca4f1f8b9bb8234 100644
|
| --- a/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc
|
| +++ b/chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc
|
| @@ -6,7 +6,7 @@
|
|
|
| #include "apps/native_app_window.h"
|
| #include "apps/shell_window.h"
|
| -#include "ash/wm/window_settings.h"
|
| +#include "ash/wm/window_state.h"
|
| #include "ash/wm/window_util.h"
|
| #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item.h"
|
| #include "chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.h"
|
| @@ -147,7 +147,7 @@ void ShellWindowLauncherItemController::Clicked(const ui::Event& event) {
|
| aura::Window* panel_window = panel->GetNativeWindow();
|
| // If the panel is attached on another display, move it to the current
|
| // display and activate it.
|
| - if (ash::wm::GetWindowSettings(panel_window)->panel_attached() &&
|
| + if (ash::wm::GetWindowState(panel_window)->panel_attached() &&
|
| ash::wm::MoveWindowToEventRoot(panel_window, event)) {
|
| if (!panel->GetBaseWindow()->IsActive())
|
| ShowAndActivateOrMinimize(panel);
|
|
|