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

chrome/browser/ui/views/status_bubble_views.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 "chrome/browser/ui/views/status_bubble_views.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/i18n/rtl.h"
@@ skipping 748 matching lines @@
       offset = size_.height() - kShadowThickness * 2;
       view_->SetStyle(StatusView::STYLE_BOTTOM);
     } else if (offset > kBubbleCornerRadius / 2 - kShadowThickness) {
       view_->SetStyle(StatusView::STYLE_FLOATING);
     } else {
       view_->SetStyle(StatusView::STYLE_STANDARD);
     }
 
     // Check if the bubble sticks out from the monitor or will obscure
     // download shelf.
     gfx::NativeView widget = base_view_->GetWidget()->GetNativeView();

[oshima, 2012/10/10 17:58:23]

s/widget/window/

[scottmg, 2012/10/10 19:04:47]

Done.

-    gfx::Rect monitor_rect =
-        gfx::Screen::GetDisplayNearestWindow(widget).work_area();
+    gfx::Rect monitor_rect = gfx::Screen::GetScreenFor(widget)->
+        GetDisplayNearestWindow(widget).work_area();
     const int bubble_bottom_y = top_left.y() + position_.y() + size_.height();
 
     if (bubble_bottom_y + offset > monitor_rect.height() ||
         (download_shelf_is_visible_ &&
          (view_->GetStyle() == StatusView::STYLE_FLOATING ||
           view_->GetStyle() == StatusView::STYLE_BOTTOM))) {
       // The offset is still too large. Move the bubble to the right and reset
       // Y offset_ to zero.
       view_->SetStyle(StatusView::STYLE_STANDARD_RIGHT);
       offset_ = 0;
@@ skipping 58 matching lines @@
 void StatusBubbleViews::SetBubbleWidth(int width) {
   size_.set_width(width);
   SetBounds(original_position_.x(), original_position_.y(),
             size_.width(), size_.height());
 }
 
 void StatusBubbleViews::CancelExpandTimer() {
   if (expand_timer_factory_.HasWeakPtrs())
     expand_timer_factory_.InvalidateWeakPtrs();
 }