Renames two WorkspaceManager methods so that they are more clearly

ash/wm/workspace/workspace_layout_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/workspace/workspace_layout_manager.h"
 
 #include "ash/screen_ash.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/workspace/workspace.h"
@@ skipping 20 matching lines @@
 
 WorkspaceLayoutManager::~WorkspaceLayoutManager() {
 }
 
 void WorkspaceLayoutManager::OnWindowResized() {
   // Workspace is updated via OnRootWindowResized.
 }
 
 void WorkspaceLayoutManager::OnWindowAddedToLayout(aura::Window* child) {
   BaseLayoutManager::OnWindowAddedToLayout(child);
-  if (!workspace_manager_->IsManagedWindow(child)) {
+  if (!workspace_manager_->ShouldManageWindow(child)) {
     if (child->IsVisible())
       workspace_manager_->UpdateShelfVisibility();
     return;
   }
 
   if (child->IsVisible())
     workspace_manager_->AddWindow(child);
 }
 
 void WorkspaceLayoutManager::OnWillRemoveWindowFromLayout(aura::Window* child) {
   workspace_manager_->RemoveWindow(child);
   BaseLayoutManager::OnWillRemoveWindowFromLayout(child);
 }
 
 void WorkspaceLayoutManager::OnWindowRemovedFromLayout(aura::Window* child) {
   workspace_manager_->UpdateShelfVisibility();
   BaseLayoutManager::OnWindowRemovedFromLayout(child);
 }
 
 void WorkspaceLayoutManager::OnChildWindowVisibilityChanged(
     aura::Window* child,
     bool visible) {
   BaseLayoutManager::OnChildWindowVisibilityChanged(child, visible);
-  if (!workspace_manager_->IsManagedWindow(child)) {
+  if (!workspace_manager_->ShouldManageWindow(child)) {
     workspace_manager_->UpdateShelfVisibility();
     return;
   }
 
   if (visible)
     workspace_manager_->AddWindow(child);
   else
     workspace_manager_->RemoveWindow(child);
 }
 
@@ skipping 15 matching lines @@
       ash::GetTrackedByWorkspace(window)) {
     // We currently don't need to support transitioning from true to false, so
     // we ignore it.
     workspace_manager_->AddWindow(window);
   }
 }
 
 void WorkspaceLayoutManager::ShowStateChanged(
     aura::Window* window,
     ui::WindowShowState last_show_state) {
-  if (workspace_manager_->IsManagedWindow(window)) {
+  if (workspace_manager_->ShouldManageWindow(window)) {
     if (wm::IsWindowMinimized(window)) {
       workspace_manager_->RemoveWindow(window);
     } else if ((window->TargetVisibility() ||
                 last_show_state == ui::SHOW_STATE_MINIMIZED) &&
-               !workspace_manager_->IsManagingWindow(window)) {
+               !workspace_manager_->Contains(window)) {
       workspace_manager_->AddWindow(window);
     }
   } else {
     workspace_manager_->UpdateShelfVisibility();
   }
   BaseLayoutManager::ShowStateChanged(window, last_show_state);
   workspace_manager_->ShowStateChanged(window);
 }
 
 }  // namespace internal
 }  // namespace ash