Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / ash / display / screen_ash.cc

diff --git a/src/ash/display/screen_ash.cc b/src/ash/display/screen_ash.cc
index 02cf9c0..9d42e49 100644 (file)
--- a/src/ash/display/screen_ash.cc
+++ b/src/ash/display/screen_ash.cc
@@ -23,7 +23,7 @@ namespace ash {
 
 namespace {
 
-internal::DisplayManager* GetDisplayManager() {
+DisplayManager* GetDisplayManager() {
   return Shell::GetInstance()->display_manager();
 }
 
@@ -136,7 +136,7 @@ gfx::Display ScreenAsh::FindDisplayContainingPoint(const gfx::Point& 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);
@@ -176,7 +176,7 @@ gfx::Rect ScreenAsh::ConvertRectFromScreen(aura::Window* window,
 
 // 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() ?
@@ -232,15 +232,15 @@ gfx::Display ScreenAsh::GetDisplayNearestWindow(gfx::NativeView window) const {
   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);
+    return GetPrimaryDisplay();
+
   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)