| Index: chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc
|
| diff --git a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc
|
| index 2c93bee4efab4c88adbbc1148e8356e725c4cbae..761872a531f2320dddcb6775f7a1a7b608522890 100644
|
| --- a/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc
|
| +++ b/chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc
|
| @@ -45,6 +45,7 @@ ChromeNativeAppWindowViewsAura::GetRestorableState(
|
| case ui::SHOW_STATE_DEFAULT:
|
| case ui::SHOW_STATE_MINIMIZED:
|
| case ui::SHOW_STATE_INACTIVE:
|
| + // TODO(afakhry): Remove Docked Windows in M58.
|
| case ui::SHOW_STATE_DOCKED:
|
| case ui::SHOW_STATE_END:
|
| return ui::SHOW_STATE_NORMAL;
|
| @@ -103,6 +104,8 @@ ui::WindowShowState ChromeNativeAppWindowViewsAura::GetRestoredState() const {
|
| // Use kPreMinimizedShowStateKey in case a window is minimized/hidden.
|
| ui::WindowShowState restore_state = widget()->GetNativeWindow()->GetProperty(
|
| aura::client::kPreMinimizedShowStateKey);
|
| +
|
| + // TODO(afakhry): Remove in M58.
|
| if (widget()->GetNativeWindow()->GetProperty(aura::client::kShowStateKey) ==
|
| ui::SHOW_STATE_DOCKED ||
|
| restore_state == ui::SHOW_STATE_DOCKED) {
|
|
|