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

ui/views/widget/tooltip_manager.h

Index: ui/views/widget/tooltip_manager.h
diff --git a/ui/views/widget/tooltip_manager.h b/ui/views/widget/tooltip_manager.h
index dd148773798e68e5afd9d46662d91470af627d46..5536d6d87d2d78e8fbd67d08b9dd069426eb0fd5 100644
--- a/ui/views/widget/tooltip_manager.h
+++ b/ui/views/widget/tooltip_manager.h
@@ -9,6 +9,7 @@
 
 #include "base/basictypes.h"
 #include "base/string16.h"
+#include "ui/gfx/native_widget_types.h"
 #include "ui/views/views_export.h"
 
 namespace gfx {
@@ -33,7 +34,7 @@ class VIEWS_EXPORT TooltipManager {
 
   // Returns the maximum width of the tooltip. |x| and |y| give the location
   // the tooltip is to be displayed on in screen coordinates.

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

update the comment

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

Done.

-  static int GetMaxWidth(int x, int y);
+  static int GetMaxWidth(int x, int y, gfx::NativeView context);
 
   TooltipManager() {}
   virtual ~TooltipManager() {}
@@ -59,7 +60,8 @@ class VIEWS_EXPORT TooltipManager {
                                int* max_width,
                                int* line_count,
                                int x,
-                               int y);
+                               int y,
+                               gfx::NativeView context);
 };
 
 }  // namespace views