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

Unified Diff: chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc

Issue 2700523004: Remove docked windows entirely in M59. (Closed)
Patch Set: Rebase Created 3 years, 10 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/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 761872a531f2320dddcb6775f7a1a7b608522890..d7074d1320df5695653dd5d9404fe5a550f00960 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,8 +45,6 @@ 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;
}
@@ -104,14 +102,6 @@ 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) {
- return ui::SHOW_STATE_DOCKED;
- }
-
return GetRestorableState(restore_state);
}

Powered by Google App Engine
This is Rietveld 408576698