Index: ash/wm/workspace/workspace.cc |
diff --git a/ash/wm/workspace/workspace.cc b/ash/wm/workspace/workspace.cc |
index cd790a1a374e9f1cac27196e211ffa1b4e8d7dc1..862c5d0bdfa52870b4f8e4d9ad06355a9faf18a3 100644 |
--- a/ash/wm/workspace/workspace.cc |
+++ b/ash/wm/workspace/workspace.cc |
@@ -19,10 +19,8 @@ namespace ash { |
namespace internal { |
Workspace::Workspace(WorkspaceManager* manager, |
- aura::Window* parent, |
- bool is_fullscreen) |
- : is_fullscreen_(is_fullscreen), |
- workspace_manager_(manager), |
+ aura::Window* parent) |
+ : workspace_manager_(manager), |
window_(new aura::Window(NULL)), |
event_handler_(new WorkspaceEventHandler(window_)), |
workspace_layout_manager_(NULL) { |
@@ -71,38 +69,5 @@ aura::Window* Workspace::ReleaseWindow() { |
return window; |
} |
-bool Workspace::ShouldMoveToPending() const { |
- if (!is_fullscreen_) |
- return false; |
- |
- for (size_t i = 0; i < window_->children().size(); ++i) { |
- aura::Window* child(window_->children()[i]); |
- if (!child->TargetVisibility() || wm::IsWindowMinimized(child)) |
- continue; |
- |
- // If we have a fullscreen window don't move to pending. |
- if (wm::IsWindowFullscreen(child)) |
- return false; |
- |
- if (GetTrackedByWorkspace(child) && !GetPersistsAcrossAllWorkspaces(child)) |
- return false; |
- } |
- return true; |
-} |
- |
-int Workspace::GetNumFullscreenWindows() const { |
- int count = 0; |
- for (size_t i = 0; i < window_->children().size(); ++i) { |
- aura::Window* child = window_->children()[i]; |
- if (GetTrackedByWorkspace(child) && |
- (wm::IsWindowFullscreen(child) || |
- WorkspaceManager::WillRestoreToWorkspace(child))) { |
- if (++count == 2) |
- return count; |
- } |
- } |
- return count; |
-} |
- |
} // namespace internal |
} // namespace ash |