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

ash/system/tray/tray_background_view.h

Index: ash/system/tray/tray_background_view.h
diff --git a/ash/system/tray/tray_background_view.h b/ash/system/tray/tray_background_view.h
index 9f33db7d212937925d25c101cdfed7e984ffc5d7..890c8bae495a21499d0c3be85c75e46372972709 100644
--- a/ash/system/tray/tray_background_view.h
+++ b/ash/system/tray/tray_background_view.h
@@ -99,6 +99,9 @@ class ASH_EXPORT TrayBackgroundView : public internal::ActionableView,
   StatusAreaWidget* status_area_widget() {
     return status_area_widget_;
   }
+  StatusAreaWidget* status_area_widget() const {

[oshima, 2012/10/09 00:26:14]

const StatusAreaWidget*

[scottmg, 2012/10/09 04:30:47]

Done.

+    return status_area_widget_;
+  }
   TrayContainer* tray_container() const { return tray_container_; }
   ShelfAlignment shelf_alignment() const { return shelf_alignment_; }