Add context to gfx::Screen calls in support of simultaneous desktop+ash

ash/system/tray/tray_bubble_view.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/system/tray/tray_bubble_view.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/tray/tray_constants.h"
@@ skipping 391 matching lines @@
                    0, 0, kPaddingFromBottomOfScreenVerticalAlignment);
       } else if (params_.shelf_alignment == SHELF_ALIGNMENT_RIGHT) {
         rect.Inset(0, 0, kPaddingFromInnerEdgeOfLauncherVerticalAlignment,
                    kPaddingFromBottomOfScreenVerticalAlignment);
       }
     }
   }
 
   // TODO(jennyz): May need to add left/right alignment in the following code.
   if (rect.IsEmpty()) {
-    rect = gfx::Screen::GetPrimaryDisplay().bounds();
+    rect = ash::Shell::GetAshScreen()->GetPrimaryDisplay().bounds();
     rect = gfx::Rect(
         base::i18n::IsRTL() ? kPaddingFromRightEdgeOfScreenBottomAlignment :
         rect.width() - kPaddingFromRightEdgeOfScreenBottomAlignment,
         rect.height() - kPaddingFromBottomOfScreenBottomAlignment,
         0, 0);
   }
   return rect;
 }
 
 gfx::Rect TrayBubbleView::GetBubbleBounds() {
@@ skipping 140 matching lines @@
       return;
   }
   // Handle clicking outside the bubble and tray. We don't block the event, so
   // it will also be handled by whatever widget was clicked on.
   OnClickedOutsideView();
 }
 
 
 }  // namespace internal
 }  // namespace ash