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..720fc172a701a1fad92017a9d62c2ea3e0cec421 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" |
@@ -62,7 +61,7 @@ wm::WorkspaceWindowState WorkspaceController::GetWindowState() const { |
// 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, |
+ kShellWindowId_DefaultContainer, |
}; |
oshima
2017/02/22 06:49:07
can you remove the loop below?
afakhry
2017/02/22 22:04:43
Done.
|
const gfx::Rect shelf_bounds(WmShelf::ForWindow(viewport_)->GetIdealBounds()); |
bool window_overlaps_launcher = false; |
@@ -81,10 +80,7 @@ wm::WorkspaceWindowState WorkspaceController::GetWindowState() const { |
} |
} |
- // 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; |
} |