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

ui/views/widget/native_widget_aura.h

 // 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.
 
 #ifndef UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_
 
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "ui/aura/client/activation_delegate.h"
@@ skipping 17 matching lines @@
 class NativeWidgetAuraWindowObserver;
 class NativeWidgetHelperAura;
 class TooltipManagerAura;
 
 class VIEWS_EXPORT NativeWidgetAura : public internal::NativeWidgetPrivate,
                                       public internal::InputMethodDelegate,
                                       public aura::WindowDelegate,
                                       public aura::client::ActivationDelegate,
                                       public aura::client::DragDropDelegate {
  public:
-  explicit NativeWidgetAura(internal::NativeWidgetDelegate* delegate);
+  explicit NativeWidgetAura(internal::NativeWidgetDelegate* delegate,
+                            gfx::NativeView parent = NULL);

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

default argument is now allowed.
remove explicit (assuming you'll keep 2nd argument)

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

Done.

 
   // TODO(beng): Find a better place for this, and the similar method on
   //             NativeWidgetWin.
   static gfx::Font GetWindowTitleFont();
 
   // Overridden from internal::NativeWidgetPrivate:
   virtual void InitNativeWidget(const Widget::InitParams& params) OVERRIDE;
   virtual NonClientFrameView* CreateNonClientFrameView() OVERRIDE;
   virtual bool ShouldUseNativeFrame() const OVERRIDE;
   virtual void FrameTypeChanged() OVERRIDE;
@@ skipping 159 matching lines @@
 
   scoped_ptr<DropHelper> drop_helper_;
   int last_drop_operation_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeWidgetAura);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_NATIVE_WIDGET_AURA_H_