Removes worskpace 1 code. Will rename next.

ash/wm/frame_painter.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/frame_painter.h"
 
 #include "ash/ash_constants.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/property_util.h"
@@ skipping 453 matching lines @@
                           title_bounds.y(),
                           title_bounds.width(),
                           title_bounds.height(),
                           gfx::Canvas::NO_SUBPIXEL_RENDERING);
   }
 }
 
 void FramePainter::LayoutHeader(views::NonClientFrameView* view,
                                 bool shorter_layout) {
   // The new assets only make sense if the window is actually maximized.
-  if (internal::WorkspaceController::IsWorkspace2Enabled() &&
-      shorter_layout && frame_->IsMaximized() &&
+  if (shorter_layout && frame_->IsMaximized() &&
       GetTrackedByWorkspace(frame_->GetNativeWindow())) {
     SetButtonImages(close_button_,
                     IDR_AURA_WINDOW_MAXIMIZED_CLOSE2,
                     IDR_AURA_WINDOW_MAXIMIZED_CLOSE2_H,
                     IDR_AURA_WINDOW_MAXIMIZED_CLOSE2_P);
     // The chat window cannot be restored but only minimized.
     // Case: (size_button_behavior_ == SIZE_BUTTON_MINIMIZES). We used to have
     // a special set of artwork to show this case, but per discussion we
     // removed this.
     SetButtonImages(size_button_,
@@ skipping 159 matching lines @@
                                    int theme_frame_id,
                                    const gfx::ImageSkia* theme_frame_overlay) {
   // User-provided themes are painted fully opaque.
   if (frame_->GetThemeProvider()->HasCustomImage(theme_frame_id))
     return kFullyOpaque;
   if (theme_frame_overlay)
     return kFullyOpaque;
 
   // Maximized windows with workspace2 are totally transparent, except those not
   // tracked by workspace code (which are used for tab dragging).
-  if (frame_->IsMaximized() &&
-      internal::WorkspaceController::IsWorkspace2Enabled() &&
-      GetTrackedByWorkspace(frame_->GetNativeWindow()))
+  if (frame_->IsMaximized() && GetTrackedByWorkspace(frame_->GetNativeWindow()))
     return 0;
 
   // Single browser window is very transparent.
   if (UseSoloWindowHeader())
     return kSoloWindowOpacity;
 
   // Otherwise, change transparency based on window activation status.
   if (header_mode == ACTIVE)
     return kActiveWindowOpacity;
   return kInactiveWindowOpacity;
@@ skipping 56 matching lines @@
     if (ignorable_window == (*it)->window_)
       continue;
 
     if (root_window != (*it)->window_->GetRootWindow())
       continue;
 
     // The window needs to be a 'normal window'. To exclude constrained windows
     // the existence of a layout manager gets additionally tested.
     if (IsVisibleNormalWindow((*it)->window_) &&
         (!(*it)->window_->GetProperty(ash::kConstrainedWindowKey))) {
-      if (internal::WorkspaceController::IsWorkspace2Enabled() &&
-          wm::IsWindowMaximized((*it)->window_)) {
+      if (wm::IsWindowMaximized((*it)->window_)) {
         return NULL;
       }
       if (painter)
         return NULL;
 
       painter = (*it);
     }
   }
 
   return painter;
@@ skipping 34 matching lines @@
   int title_y =
       (view->GetBoundsForClientView().y() - title_font.GetHeight()) / 2;
   return gfx::Rect(
       title_x,
       std::max(0, title_y),
       std::max(0, size_button_->x() - kTitleLogoSpacing - title_x),
       title_font.GetHeight());
 }
 
 }  // namespace ash