Eliminate ash::internal namespace

ash/display/screen_ash.cc

 // Copyright 2014 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/display/screen_ash.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/root_window_settings.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/wm/coordinate_conversion.h"
 #include "base/logging.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/screen.h"
 
 namespace ash {
 
 namespace {
 
-internal::DisplayManager* GetDisplayManager() {
+DisplayManager* GetDisplayManager() {
   return Shell::GetInstance()->display_manager();
 }
 
 gfx::Display FindDisplayNearestPoint(const std::vector<gfx::Display>& displays,
                                      const gfx::Point& point) {
   int min_distance = INT_MAX;
   const gfx::Display* nearest_display = NULL;
   for (std::vector<gfx::Display>::const_iterator iter = displays.begin();
        iter != displays.end(); ++iter) {
     const gfx::Display& display = *iter;
@@ skipping 92 matching lines @@
 ScreenAsh::~ScreenAsh() {
 }
 
 // static
 gfx::Display ScreenAsh::FindDisplayContainingPoint(const gfx::Point& point) {
   return GetDisplayManager()->FindDisplayContainingPoint(point);
 }
 
 // static
 gfx::Rect ScreenAsh::GetMaximizedWindowBoundsInParent(aura::Window* window) {
-  if (internal::GetRootWindowController(window->GetRootWindow())->shelf())
+  if (GetRootWindowController(window->GetRootWindow())->shelf())
     return GetDisplayWorkAreaBoundsInParent(window);
   else
     return GetDisplayBoundsInParent(window);
 }
 
 // static
 gfx::Rect ScreenAsh::GetDisplayBoundsInParent(aura::Window* window) {
   return ConvertRectFromScreen(
       window->parent(),
       Shell::GetScreen()->GetDisplayNearestWindow(window).bounds());
@@ skipping 19 matching lines @@
 gfx::Rect ScreenAsh::ConvertRectFromScreen(aura::Window* window,
                                            const gfx::Rect& rect) {
   gfx::Point point = rect.origin();
   aura::client::GetScreenPositionClient(window->GetRootWindow())->
       ConvertPointFromScreen(window, &point);
   return gfx::Rect(point, rect.size());
 }
 
 // static
 const gfx::Display& ScreenAsh::GetSecondaryDisplay() {
-  internal::DisplayManager* display_manager = GetDisplayManager();
+  DisplayManager* display_manager = GetDisplayManager();
   CHECK_EQ(2U, display_manager->GetNumDisplays());
   return display_manager->GetDisplayAt(0).id() ==
       Shell::GetScreen()->GetPrimaryDisplay().id() ?
       display_manager->GetDisplayAt(1) : display_manager->GetDisplayAt(0);
 }
 
 // static
 const gfx::Display& ScreenAsh::GetDisplayForId(int64 display_id) {
   return GetDisplayManager()->GetDisplayForId(display_id);
 }
@@ skipping 35 matching lines @@
 std::vector<gfx::Display> ScreenAsh::GetAllDisplays() const {
   return GetDisplayManager()->displays();
 }
 
 gfx::Display ScreenAsh::GetDisplayNearestWindow(gfx::NativeView window) const {
   if (!window)
     return GetPrimaryDisplay();
   const aura::Window* root_window = window->GetRootWindow();
   if (!root_window)
     return GetPrimaryDisplay();
-  const internal::RootWindowSettings* rws =
-      internal::GetRootWindowSettings(root_window);
+  const RootWindowSettings* rws = GetRootWindowSettings(root_window);
   if (rws->shutdown)
     return gfx::Display(1);
   int64 id = rws->display_id;
   // if id is |kInvaildDisplayID|, it's being deleted.
   DCHECK(id != gfx::Display::kInvalidDisplayID);
 
-  internal::DisplayManager* display_manager = GetDisplayManager();
+  DisplayManager* display_manager = GetDisplayManager();
   // RootWindow needs Display to determine its device scale factor
   // for non desktop display.
   if (display_manager->non_desktop_display().id() == id)
     return display_manager->non_desktop_display();
   return display_manager->GetDisplayForId(id);
 }
 
 gfx::Display ScreenAsh::GetDisplayNearestPoint(const gfx::Point& point) const {
   const gfx::Display& display =
       GetDisplayManager()->FindDisplayContainingPoint(point);
@@ skipping 25 matching lines @@
 
 void ScreenAsh::RemoveObserver(gfx::DisplayObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
 gfx::Screen* ScreenAsh::CloneForShutdown() {
   return new ScreenForShutdown(this);
 }
 
 }  // namespace ash