Removes most of aura dependencies from DefaultState

ash/wm/workspace_controller.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_controller.h"
 
 #include <utility>
 
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
@@ skipping 44 matching lines @@
 
   viewport_->SetLayoutManager(layout_manager_);
   viewport_->AddPreTargetHandler(event_handler_.get());
 }
 
 WorkspaceController::~WorkspaceController() {
   viewport_->SetLayoutManager(NULL);
   viewport_->RemovePreTargetHandler(event_handler_.get());
 }
 
-WorkspaceWindowState WorkspaceController::GetWindowState() const {
+wm::WorkspaceWindowState WorkspaceController::GetWindowState() const {
   if (!shelf_)
-    return WORKSPACE_WINDOW_STATE_DEFAULT;
+    return wm::WORKSPACE_WINDOW_STATE_DEFAULT;
   const aura::Window* topmost_fullscreen_window = GetRootWindowController(
       viewport_->GetRootWindow())->GetWindowForFullscreenMode();
   if (topmost_fullscreen_window &&
       !wm::GetWindowState(topmost_fullscreen_window)->ignored_by_shelf()) {
-    return WORKSPACE_WINDOW_STATE_FULL_SCREEN;
+    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(shelf_->GetIdealBounds());
   bool window_overlaps_launcher = false;
   for (size_t idx = 0; idx < arraysize(kWindowContainerIds); idx++) {
     const aura::Window* container = Shell::GetContainer(
         viewport_->GetRootWindow(), kWindowContainerIds[idx]);
     const aura::Window::Windows& windows(container->children());
     for (aura::Window::Windows::const_iterator i = windows.begin();
          i != windows.end(); ++i) {
       wm::WindowState* window_state = wm::GetWindowState(*i);
       if (window_state->ignored_by_shelf())
         continue;
       ui::Layer* layer = (*i)->layer();
       if (!layer->GetTargetVisibility())
         continue;
       if (window_state->IsMaximized())
-        return WORKSPACE_WINDOW_STATE_MAXIMIZED;
+        return wm::WORKSPACE_WINDOW_STATE_MAXIMIZED;
       if (!window_overlaps_launcher &&
           ((*i)->bounds().Intersects(shelf_bounds))) {
         window_overlaps_launcher = true;
       }
     }
   }
 
-  return (window_overlaps_launcher || IsDockedAreaVisible(shelf_)) ?
-      WORKSPACE_WINDOW_STATE_WINDOW_OVERLAPS_SHELF :
-      WORKSPACE_WINDOW_STATE_DEFAULT;
+  return (window_overlaps_launcher || IsDockedAreaVisible(shelf_))
+             ? wm::WORKSPACE_WINDOW_STATE_WINDOW_OVERLAPS_SHELF
+             : wm::WORKSPACE_WINDOW_STATE_DEFAULT;
 }
 
 void WorkspaceController::SetShelf(ShelfLayoutManager* shelf) {
   shelf_ = shelf;
 }
 
 void WorkspaceController::DoInitialAnimation() {
   viewport_->Show();
 
   viewport_->layer()->SetOpacity(0.0f);
@@ skipping 21 matching lines @@
     viewport_->layer()->SetOpacity(1.0f);
   }
 }
 
 void WorkspaceController::SetMaximizeBackdropDelegate(
     std::unique_ptr<WorkspaceLayoutManagerBackdropDelegate> delegate) {
   layout_manager_->SetMaximizeBackdropDelegate(std::move(delegate));
 }
 
 }  // namespace ash