[Cleanup] Screen cleanup

ash/wm/panels/panel_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/panels/panel_layout_manager.h"
 
 #include <algorithm>
 #include <map>
 
-#include "ash/screen_ash.h"
+#include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "base/auto_reset.h"
@@ skipping 204 matching lines @@
 
  private:
   void InitWidget(aura::Window* parent) {
     views::Widget::InitParams params;
     params.type = views::Widget::InitParams::TYPE_POPUP;
     params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
     params.can_activate = false;
     params.keep_on_top = true;
     params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
     params.parent = parent;
-    params.bounds = ScreenAsh::ConvertRectToScreen(parent, gfx::Rect());
+    params.bounds = ScreenUtil::ConvertRectToScreen(parent, gfx::Rect());
     params.bounds.set_width(kArrowWidth);
     params.bounds.set_height(kArrowHeight);
     // Why do we need this and can_activate = false?
     set_focus_on_creation(false);
     Init(params);
     DCHECK_EQ(GetNativeView()->GetRootWindow(), parent->GetRootWindow());
     views::View* content_view = new views::View;
     background_ = new CalloutWidgetBackground;
     content_view->set_background(background_);
     SetContentsView(content_view);
@@ skipping 333 matching lines @@
   if (!shelf_ || !shelf_->shelf_widget())
     return;
 
   if (in_layout_)
     return;
   base::AutoReset<bool> auto_reset_in_layout(&in_layout_, true);
 
   ShelfAlignment alignment = shelf_->shelf_widget()->GetAlignment();
   bool horizontal = alignment == SHELF_ALIGNMENT_TOP ||
                     alignment == SHELF_ALIGNMENT_BOTTOM;
-  gfx::Rect shelf_bounds = ash::ScreenAsh::ConvertRectFromScreen(
+  gfx::Rect shelf_bounds = ash::ScreenUtil::ConvertRectFromScreen(
       panel_container_, shelf_->shelf_widget()->GetWindowBoundsInScreen());
   int panel_start_bounds = kPanelIdealSpacing;
   int panel_end_bounds = horizontal ?
       panel_container_->bounds().width() - kPanelIdealSpacing :
       panel_container_->bounds().height() - kPanelIdealSpacing;
   aura::Window* active_panel = NULL;
   std::vector<VisiblePanelPositionInfo> visible_panels;
   for (PanelList::iterator iter = panel_windows_.begin();
        iter != panel_windows_.end(); ++iter) {
     aura::Window* panel = iter->window;
@@ skipping 23 matching lines @@
     // correctly and the panel can be aligned above where the hidden icon is.
     if (icon_bounds.width() == 0 && icon_bounds.height() == 0)
       continue;
 
     if (panel->HasFocus() ||
         panel->Contains(
             aura::client::GetFocusClient(panel)->GetFocusedWindow())) {
       DCHECK(!active_panel);
       active_panel = panel;
     }
-    icon_bounds = ScreenAsh::ConvertRectFromScreen(panel_container_,
-                                                   icon_bounds);
+    icon_bounds = ScreenUtil::ConvertRectFromScreen(panel_container_,
+                                                    icon_bounds);
     gfx::Point icon_origin = icon_bounds.origin();
     VisiblePanelPositionInfo position_info;
     int icon_start = horizontal ? icon_origin.x() : icon_origin.y();
     int icon_end = icon_start + (horizontal ? icon_bounds.width() :
                                  icon_bounds.height());
     position_info.major_length = horizontal ?
         panel->bounds().width() : panel->bounds().height();
     position_info.min_major = std::max(
         panel_start_bounds + position_info.major_length / 2,
         icon_end - position_info.major_length / 2);
@@ skipping 144 matching lines @@
   ShelfAlignment alignment = shelf_->alignment();
   bool horizontal = alignment == SHELF_ALIGNMENT_TOP ||
                     alignment == SHELF_ALIGNMENT_BOTTOM;
 
   for (PanelList::iterator iter = panel_windows_.begin();
        iter != panel_windows_.end(); ++iter) {
     aura::Window* panel = iter->window;
     views::Widget* callout_widget = iter->callout_widget;
 
     gfx::Rect current_bounds = panel->GetBoundsInScreen();
-    gfx::Rect bounds = ScreenAsh::ConvertRectToScreen(panel->parent(),
-                                                      panel->GetTargetBounds());
+    gfx::Rect bounds = ScreenUtil::ConvertRectToScreen(
+        panel->parent(),
+        panel->GetTargetBounds());
     gfx::Rect icon_bounds = shelf_->GetScreenBoundsOfItemIconForWindow(panel);
     if (icon_bounds.IsEmpty() || !panel->layer()->GetTargetVisibility() ||
         panel == dragged_panel_) {
       callout_widget->Hide();
       callout_widget->GetNativeWindow()->layer()->SetOpacity(0);
       continue;
     }
 
     gfx::Rect callout_bounds = callout_widget->GetWindowBoundsInScreen();
     gfx::Vector2d slide_vector = bounds.origin() - current_bounds.origin();
@@ skipping 20 matching lines @@
       case SHELF_ALIGNMENT_LEFT:
         callout_bounds.set_x(bounds.x() - callout_bounds.width());
         break;
       case SHELF_ALIGNMENT_RIGHT:
         callout_bounds.set_x(bounds.right());
         break;
       case SHELF_ALIGNMENT_TOP:
         callout_bounds.set_y(bounds.y() - callout_bounds.height());
         break;
     }
-    callout_bounds = ScreenAsh::ConvertRectFromScreen(
+    callout_bounds = ScreenUtil::ConvertRectFromScreen(
         callout_widget->GetNativeWindow()->parent(),
         callout_bounds);
 
     SetChildBoundsDirect(callout_widget->GetNativeWindow(), callout_bounds);
     panel_container_->StackChildAbove(callout_widget->GetNativeWindow(),
                                       panel);
     callout_widget->Show();
 
     ui::Layer* layer = callout_widget->GetNativeWindow()->layer();
     // If the panel is not over the callout position or has just become visible
@@ skipping 31 matching lines @@
 
 void PanelLayoutManager::OnKeyboardBoundsChanging(
     const gfx::Rect& keyboard_bounds) {
   // This bounds change will have caused a change to the Shelf which does not
   // propogate automatically to this class, so manually recalculate bounds.
   OnWindowResized();
 }
 
 }  // namespace internal
 }  // namespace ash