Remove/replace RootView/Widget getters with new NativeWidget getters.

BUG=72040
TEST=existing unittests.

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

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

6 files changed, 24 insertions, 22 deletions

diff --git a/chrome/browser/automation/testing_automation_provider_views.cc b/chrome/browser/automation/testing_automation_provider_views.cc
index 99b4065..01fedb8 100644
--- a/chrome/browser/automation/testing_automation_provider_views.cc
+++ b/chrome/browser/automation/testing_automation_provider_views.cc
@@ -13,6 +13,7 @@
 #include "ui/gfx/point.h"
 #include "views/controls/menu/menu_wrapper.h"
 #include "views/view.h"
+#include "views/widget/native_widget.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 
@@ -121,8 +122,10 @@ void TestingAutomationProvider::WindowGetViewBounds(int handle,
 
   if (window_tracker_->ContainsHandle(handle)) {
     gfx::NativeWindow window = window_tracker_->GetResource(handle);
-    views::RootView* root_view = views::Widget::FindRootView(window);
-    if (root_view) {
+    views::NativeWidget* native_widget =
+        views::NativeWidget::GetNativeWidgetForNativeWindow(window);
+    if (native_widget) {
+      views::View* root_view = native_widget->GetWidget()->GetRootView();
       views::View* view = root_view->GetViewByID(view_id);
       if (view) {
         *success = true;
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc
index 80d2bf0..eb75b1b 100644
--- a/chrome/browser/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_utils.cc
@@ -40,7 +40,7 @@
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "views/drag_utils.h"
 #include "views/events/event.h"
-#include "views/widget/root_view.h"
+#include "views/widget/native_widget.h"
 #include "views/widget/widget.h"
 #elif defined(TOOLKIT_GTK)
 #include "chrome/browser/ui/gtk/custom_drag.h"
@@ -335,10 +335,13 @@ void DragBookmarks(Profile* profile,
   bool was_nested = MessageLoop::current()->IsNested();
   MessageLoop::current()->SetNestableTasksAllowed(true);
 
-  views::Widget* widget = views::Widget::GetWidgetFromNativeView(view);
-  widget->StartDragForViewFromMouseEvent(NULL, data,
-      ui::DragDropTypes::DRAG_COPY | ui::DragDropTypes::DRAG_MOVE |
-      ui::DragDropTypes::DRAG_LINK);
+  views::NativeWidget* native_widget =
+      views::NativeWidget::GetNativeWidgetForNativeView(view);
+  if (native_widget) {
+    native_widget->GetWidget()->StartDragForViewFromMouseEvent(NULL, data,
+        ui::DragDropTypes::DRAG_COPY | ui::DragDropTypes::DRAG_MOVE |
+        ui::DragDropTypes::DRAG_LINK);
+  }
 
   MessageLoop::current()->SetNestableTasksAllowed(was_nested);
 #elif defined(OS_MACOSX)
diff --git a/chrome/browser/chromeos/setting_level_bubble.cc b/chrome/browser/chromeos/setting_level_bubble.cc
index 55aec2e..6633ab8 100644
--- a/chrome/browser/chromeos/setting_level_bubble.cc
+++ b/chrome/browser/chromeos/setting_level_bubble.cc
@@ -45,14 +45,10 @@ static views::Widget* GetToplevelWidget() {
   if (!browser)
     return NULL;
 
-  views::RootView* root =
-      views::Widget::FindRootView(
+  views::NativeWidget* native_widget =
+      views::NativeWidget::GetNativeWidgetForNativeWindow(
           GTK_WINDOW(browser->window()->GetNativeHandle()));
-  DCHECK(root);
-  if (!root)
-    return NULL;
-
-  return root->GetWidget();
+  return native_widget->GetWidget();
 }
 
 SettingLevelBubble::SettingLevelBubble(SkBitmap* increase_icon,
diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc
index 215997f..ae0f398 100644
--- a/chrome/browser/download/download_util.cc
+++ b/chrome/browser/download/download_util.cc
@@ -540,7 +540,8 @@ void DragDownload(const DownloadItem* download,
   GtkWidget* root = gtk_widget_get_toplevel(view);
   if (!root)
     return;
-  views::WidgetGtk* widget = views::WidgetGtk::GetViewForNative(root);
+  views::WidgetGtk* widget = static_cast<views::WidgetGtk*>(
+      views::NativeWidget::GetNativeWidgetForNativeView(root));
   if (!widget)
     return;
 
diff --git a/chrome/browser/speech/speech_input_bubble_views.cc b/chrome/browser/speech/speech_input_bubble_views.cc
index 6abe5d5..37f53bc 100644
--- a/chrome/browser/speech/speech_input_bubble_views.cc
+++ b/chrome/browser/speech/speech_input_bubble_views.cc
@@ -281,12 +281,11 @@ void SpeechInputBubbleImpl::Show() {
   bubble_content_ = new ContentView(delegate_);
   UpdateLayout();
 
-  views::Widget* tab = views::Widget::GetWidgetFromNativeView(
-      tab_contents()->view()->GetNativeView());
-  views::Widget* parent = tab ? tab->GetRootWidget() : NULL;
-
-  if (parent) {
-    info_bubble_ = InfoBubble::Show(parent,
+  views::NativeWidget* toplevel_widget =
+      views::NativeWidget::GetTopLevelNativeWidget(
+          tab_contents()->view()->GetNativeView());
+  if (toplevel_widget) {
+    info_bubble_ = InfoBubble::Show(toplevel_widget->GetWidget(),
                                     GetInfoBubbleTarget(element_rect_),
                                     BubbleBorder::TOP_LEFT, bubble_content_,
                                     this);
diff --git a/chrome/browser/ui/views/find_bar_host_gtk.cc b/chrome/browser/ui/views/find_bar_host_gtk.cc
index bacb9d8..c0819df 100644
--- a/chrome/browser/ui/views/find_bar_host_gtk.cc
+++ b/chrome/browser/ui/views/find_bar_host_gtk.cc
@@ -18,7 +18,7 @@ void FindBarHost::AudibleAlert() {
 
 void FindBarHost::GetWidgetPositionNative(gfx::Rect* avoid_overlapping_rect) {
   gfx::Rect frame_rect, webcontents_rect;
-  host()->GetRootWidget()->GetBounds(&frame_rect, true);
+  host()->GetTopLevelWidget()->GetBounds(&frame_rect, true);
   TabContentsView* tab_view = find_bar_controller_->tab_contents()->view();
   tab_view->GetViewBounds(&webcontents_rect);
   avoid_overlapping_rect->Offset(0, webcontents_rect.y() - frame_rect.y());