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

Unified Diff: ash/common/wm/workspace_controller.cc

Issue 2700523004: Remove docked windows entirely in M59. (Closed)
Patch Set: Rebase Created 3 years, 9 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
« no previous file with comments | « ash/common/wm/workspace/workspace_window_resizer.cc ('k') | ash/display/display_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/workspace_controller.cc
diff --git a/ash/common/wm/workspace_controller.cc b/ash/common/wm/workspace_controller.cc
index 09f742be505661931b4e4bd67343bed4ea5704c3..df544ed458e6e424280404081e37ff7604f3014e 100644
--- a/ash/common/wm/workspace_controller.cc
+++ b/ash/common/wm/workspace_controller.cc
@@ -7,7 +7,6 @@
#include <utility>
#include "ash/common/shelf/wm_shelf.h"
-#include "ash/common/wm/dock/docked_window_layout_manager.h"
#include "ash/common/wm/fullscreen_window_finder.h"
#include "ash/common/wm/window_state.h"
#include "ash/common/wm/wm_window_animations.h"
@@ -59,32 +58,24 @@ wm::WorkspaceWindowState WorkspaceController::GetWindowState() const {
if (fullscreen && !fullscreen->GetWindowState()->ignored_by_shelf())
return wm::WORKSPACE_WINDOW_STATE_FULL_SCREEN;
- // These are the container ids of containers which may contain windows that
- // may overlap the launcher shelf and affect its transparency.
- const int kWindowContainerIds[] = {
- kShellWindowId_DefaultContainer, kShellWindowId_DockedContainer,
- };
const gfx::Rect shelf_bounds(WmShelf::ForWindow(viewport_)->GetIdealBounds());
bool window_overlaps_launcher = false;
- for (size_t i = 0; i < arraysize(kWindowContainerIds); i++) {
- WmWindow* container = viewport_->GetRootWindow()->GetChildByShellWindowId(
- kWindowContainerIds[i]);
- for (WmWindow* window : container->GetChildren()) {
- wm::WindowState* window_state = window->GetWindowState();
- if (window_state->ignored_by_shelf() ||
- (window->GetLayer() && !window->GetLayer()->GetTargetVisibility())) {
- continue;
- }
- if (window_state->IsMaximized())
- return wm::WORKSPACE_WINDOW_STATE_MAXIMIZED;
- window_overlaps_launcher |= window->GetBounds().Intersects(shelf_bounds);
+ // The default container may contain windows that may overlap the launcher
+ // shelf and affect its transparency.
+ WmWindow* container = viewport_->GetRootWindow()->GetChildByShellWindowId(
+ kShellWindowId_DefaultContainer);
+ for (WmWindow* window : container->GetChildren()) {
+ wm::WindowState* window_state = window->GetWindowState();
+ if (window_state->ignored_by_shelf() ||
+ (window->GetLayer() && !window->GetLayer()->GetTargetVisibility())) {
+ continue;
}
+ if (window_state->IsMaximized())
+ return wm::WORKSPACE_WINDOW_STATE_MAXIMIZED;
+ window_overlaps_launcher |= window->GetBounds().Intersects(shelf_bounds);
}
- // Check if there are visible docked windows in the same display.
- DockedWindowLayoutManager* dock = DockedWindowLayoutManager::Get(viewport_);
- const bool docked_area_visible = dock && !dock->docked_bounds().IsEmpty();
- return (window_overlaps_launcher || docked_area_visible)
+ return window_overlaps_launcher
? wm::WORKSPACE_WINDOW_STATE_WINDOW_OVERLAPS_SHELF
: wm::WORKSPACE_WINDOW_STATE_DEFAULT;
}
« no previous file with comments | « ash/common/wm/workspace/workspace_window_resizer.cc ('k') | ash/display/display_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698