[Cleanup] Screen cleanup

ash/wm/app_list_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/app_list_controller.h"
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
-#include "ash/screen_ash.h"
+#include "ash/screen_util.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "base/command_line.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/pagination_model.h"
 #include "ui/app_list/views/app_list_view.h"
 #include "ui/aura/client/focus_client.h"
@@ skipping 143 matching lines @@
     // will be released with AppListView on close.
     app_list::AppListView* view = new app_list::AppListView(
         Shell::GetInstance()->delegate()->CreateAppListViewDelegate());
     aura::Window* root_window = window->GetRootWindow();
     aura::Window* container = GetRootWindowController(root_window)->
         GetContainer(kShellWindowId_AppListContainer);
     if (ash::switches::UseAlternateShelfLayout()) {
       gfx::Rect applist_button_bounds = Shelf::ForWindow(container)->
           GetAppListButtonView()->GetBoundsInScreen();
       // We need the location of the button within the local screen.
-      applist_button_bounds = ash::ScreenAsh::ConvertRectFromScreen(
+      applist_button_bounds = ScreenUtil::ConvertRectFromScreen(
           root_window,
           applist_button_bounds);
       view->InitAsBubbleAttachedToAnchor(
           container,
           pagination_model_.get(),
           Shelf::ForWindow(container)->GetAppListButtonView(),
           GetAnchorPositionOffsetToShelf(applist_button_bounds,
               Shelf::ForWindow(container)->GetAppListButtonView()->
                   GetWidget()),
           GetBubbleArrow(container),
           true /* border_accepts_events */);
       view->SetArrowPaintType(views::BubbleBorder::PAINT_NONE);
     } else {
       view->InitAsBubbleAttachedToAnchor(
           container,
           pagination_model_.get(),
           Shelf::ForWindow(container)->GetAppListButtonView(),
           gfx::Vector2d(),
           GetBubbleArrow(container),
           true /* border_accepts_events */);
     }
     SetView(view);
     // By setting us as DnD recipient, the app list knows that we can
     // handle items.
     if (!CommandLine::ForCurrentProcess()->HasSwitch(
-            ash::switches::kAshDisableDragAndDropAppListToLauncher)) {
+            switches::kAshDisableDragAndDropAppListToLauncher)) {
       SetDragAndDropHostOfCurrentAppList(
           Shelf::ForWindow(window)->GetDragAndDropHostForAppList());
     }
   }
   // Update applist button status when app list visibility is changed.
   Shelf::ForWindow(window)->GetAppListButtonView()->SchedulePaint();
 }
 
 bool AppListController::IsVisible() const {
   return view_ && view_->GetWidget()->IsVisible();
@@ skipping 70 matching lines @@
 
 void AppListController::ProcessLocatedEvent(ui::LocatedEvent* event) {
   // If the event happened on a menu, then the event should not close the app
   // list.
   aura::Window* target = static_cast<aura::Window*>(event->target());
   if (target) {
     RootWindowController* root_controller =
         GetRootWindowController(target->GetRootWindow());
     if (root_controller) {
       aura::Window* menu_container = root_controller->GetContainer(
-          ash::internal::kShellWindowId_MenuContainer);
+          internal::kShellWindowId_MenuContainer);
       if (menu_container->Contains(target))
         return;
       aura::Window* keyboard_container = root_controller->GetContainer(
-          ash::internal::kShellWindowId_VirtualKeyboardContainer);
+          internal::kShellWindowId_VirtualKeyboardContainer);
       if (keyboard_container->Contains(target))
         return;
     }
   }
 
   if (view_ && is_visible_) {
     aura::Window* window = view_->GetWidget()->GetNativeView();
     gfx::Point window_local_point(event->root_location());
     aura::Window::ConvertPointToTarget(window->GetRootWindow(),
                                        window,
@@ skipping 125 matching lines @@
     should_snap_back_ = false;
     ui::ScopedLayerAnimationSettings animation(widget_animator);
     animation.SetTransitionDuration(base::TimeDelta::FromMilliseconds(
         app_list::kOverscrollPageTransitionDurationMs));
     widget->SetBounds(view_bounds_);
   }
 }
 
 }  // namespace internal
 }  // namespace ash