Revert 74693. Changing approach.

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

1 files changed, 12 insertions, 12 deletions

diff --git a/chrome/browser/ui/views/browser_bubble_win.cc b/chrome/browser/ui/views/browser_bubble_win.cc
index 6f1d8dc..4d75cdf 100644
--- a/chrome/browser/ui/views/browser_bubble_win.cc
+++ b/chrome/browser/ui/views/browser_bubble_win.cc
@@ -5,11 +5,11 @@
 #include "chrome/browser/ui/views/browser_bubble.h"
 
 #include "chrome/browser/ui/views/frame/browser_view.h"
-#include "views/widget/native_widget_win.h"
 #include "views/widget/root_view.h"
+#include "views/widget/widget_win.h"
 #include "views/window/window.h"
 
-class BubbleWidget : public views::NativeWidgetWin {
+class BubbleWidget : public views::WidgetWin {
  public:
   explicit BubbleWidget(BrowserBubble* bubble)
       : bubble_(bubble) {
@@ -21,7 +21,7 @@ class BubbleWidget : public views::NativeWidgetWin {
     if (activate)
       ShowWindow(SW_SHOW);
     else
-      views::NativeWidgetWin::Show();
+      views::WidgetWin::Show();
   }
 
   void Close() {
@@ -32,7 +32,7 @@ class BubbleWidget : public views::NativeWidgetWin {
       if (delegate)
         delegate->BubbleLostFocus(bubble_, NULL);
     }
-    views::NativeWidgetWin::Close();
+    views::WidgetWin::Close();
     bubble_ = NULL;
   }
 
@@ -42,11 +42,11 @@ class BubbleWidget : public views::NativeWidgetWin {
       if (delegate)
         delegate->BubbleLostFocus(bubble_, NULL);
     }
-    views::NativeWidgetWin::Hide();
+    views::WidgetWin::Hide();
   }
 
   void OnActivate(UINT action, BOOL minimized, HWND window) {
-    NativeWidgetWin::OnActivate(action, minimized, window);
+    WidgetWin::OnActivate(action, minimized, window);
     if (!bubble_)
       return;
 
@@ -82,7 +82,7 @@ class BubbleWidget : public views::NativeWidgetWin {
   }
 
   virtual void OnSetFocus(HWND focused_window) {
-    NativeWidgetWin::OnSetFocus(focused_window);
+    WidgetWin::OnSetFocus(focused_window);
     if (bubble_ && bubble_->delegate())
       bubble_->delegate()->BubbleGotFocus(bubble_);
   }
@@ -94,9 +94,9 @@ class BubbleWidget : public views::NativeWidgetWin {
 };
 
 void BrowserBubble::InitPopup() {
-  // popup_ is a Widget, but we need to do some NativeWidgetWin stuff first,
-  // then we'll assign it into popup_.
-  views::NativeWidgetWin* pop = new BubbleWidget(this);
+  // popup_ is a Widget, but we need to do some WidgetWin stuff first, then
+  // we'll assign it into popup_.
+  views::WidgetWin* pop = new BubbleWidget(this);
 
   pop->Init(frame_->GetNativeView(), bounds_);
   pop->SetContentsView(view_);
@@ -107,7 +107,7 @@ void BrowserBubble::InitPopup() {
 }
 
 void BrowserBubble::MovePopup(int x, int y, int w, int h) {
-  views::NativeWidgetWin* pop = static_cast<views::NativeWidgetWin*>(popup_);
+  views::WidgetWin* pop = static_cast<views::WidgetWin*>(popup_);
   pop->SetBounds(gfx::Rect(x, y, w, h));
 }
 
@@ -122,7 +122,7 @@ void BrowserBubble::Show(bool activate) {
 void BrowserBubble::Hide() {
   if (!visible_)
     return;
-  views::NativeWidgetWin* pop = static_cast<views::NativeWidgetWin*>(popup_);
+  views::WidgetWin* pop = static_cast<views::WidgetWin*>(popup_);
   pop->Hide();
   visible_ = false;
 }