Correct implementation of View::ConvertPointToScreen for the views-desktop environment.

Also removes the unnecessary clear from RootView since this is interfering with transparent Widgets.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/7237040

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91890 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 2 insertions, 6 deletions

diff --git a/views/widget/native_widget_view.cc b/views/widget/native_widget_view.cc
index 5e95a9c..1df6e3c 100644
--- a/views/widget/native_widget_view.cc
+++ b/views/widget/native_widget_view.cc
@@ -62,7 +62,6 @@ void NativeWidgetView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
 }
 
 void NativeWidgetView::OnPaint(gfx::Canvas* canvas) {
-  canvas->FillRectInt(SK_ColorRED, 0, 0, width(), height());
   delegate()->OnNativeWidgetPaint(canvas);
 }
 
diff --git a/views/widget/native_widget_views.cc b/views/widget/native_widget_views.cc
index 5ab335f..d33de39 100644
--- a/views/widget/native_widget_views.cc
+++ b/views/widget/native_widget_views.cc
@@ -209,6 +209,8 @@ void NativeWidgetViews::BecomeModal() {
 }
 
 gfx::Rect NativeWidgetViews::GetWindowScreenBounds() const {
+  if (GetWidget() == GetWidget()->GetTopLevelWidget())
+    return view_->bounds();
   gfx::Point origin = view_->bounds().origin();
   View::ConvertPointToScreen(view_->parent(), &origin);
   return gfx::Rect(origin.x(), origin.y(), view_->width(), view_->height());
diff --git a/views/widget/root_view.cc b/views/widget/root_view.cc
index 0e5ecce..228c20e 100644
--- a/views/widget/root_view.cc
+++ b/views/widget/root_view.cc
@@ -417,10 +417,6 @@ void RootView::ViewHierarchyChanged(bool is_add, View* parent, View* child) {
   }
 }
 
-void RootView::OnPaint(gfx::Canvas* canvas) {
-  canvas->AsCanvasSkia()->drawColor(SK_ColorBLACK, SkXfermode::kClear_Mode);
-}
-
 const ui::Compositor* RootView::GetCompositor() const {
   return widget_->GetCompositor();
 }
diff --git a/views/widget/root_view.h b/views/widget/root_view.h
index b33ecf5..4538e5a 100644
--- a/views/widget/root_view.h
+++ b/views/widget/root_view.h
@@ -121,7 +121,6 @@ class RootView : public View,
   // Overridden from View:
   virtual void ViewHierarchyChanged(bool is_add, View* parent,
                                     View* child) OVERRIDE;
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
   virtual const ui::Compositor* GetCompositor() const OVERRIDE;
   virtual ui::Compositor* GetCompositor() OVERRIDE;
   virtual void MarkLayerDirty() OVERRIDE;