Reverting to fix builder redness. Please fix and reland.

Revert 76483 - Remove/replace RootView/Widget getters with new NativeWidget getters.

BUG=72040
TEST=existing unittests.

Review URL: http://codereview.chromium.org/6598069

TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/6597099

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

1 files changed, 4 insertions, 12 deletions

diff --git a/views/widget/widget.cc b/views/widget/widget.cc
index c280206..0299c2d 100644
--- a/views/widget/widget.cc
+++ b/views/widget/widget.cc
@@ -7,7 +7,6 @@
 #include "base/logging.h"
 #include "views/widget/default_theme_provider.h"
 #include "views/widget/root_view.h"
-#include "views/widget/native_widget.h"
 
 namespace views {
 
@@ -29,17 +28,6 @@ void Widget::Init(gfx::NativeView parent, const gfx::Rect& bounds) {
 void Widget::InitWithWidget(Widget* parent, const gfx::Rect& bounds) {
 }
 
-Widget* Widget::GetTopLevelWidget() {
-  return const_cast<Widget*>(
-      const_cast<const Widget*>(this)->GetTopLevelWidget());
-}
-
-const Widget* Widget::GetTopLevelWidget() const {
-  NativeWidget* native_widget =
-      NativeWidget::GetTopLevelNativeWidget(GetNativeView());
-  return native_widget ? native_widget->GetWidget() : NULL;
-}
-
 WidgetDelegate* Widget::GetWidgetDelegate() {
   return delegate_;
 }
@@ -94,6 +82,10 @@ RootView* Widget::GetRootView() {
   return root_view_.get();
 }
 
+Widget* Widget::GetRootWidget() const {
+  return NULL;
+}
+
 bool Widget::IsVisible() const {
   return false;
 }