Revert 74693. Changing approach.

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

4 files changed, 11 insertions, 11 deletions

diff --git a/views/controls/menu/menu_host_win.cc b/views/controls/menu/menu_host_win.cc
index 2be9ad5..c22dcb9 100644
--- a/views/controls/menu/menu_host_win.cc
+++ b/views/controls/menu/menu_host_win.cc
@@ -42,7 +42,7 @@ void MenuHostWin::Init(HWND parent,
                        const gfx::Rect& bounds,
                        View* contents_view,
                        bool do_capture) {
-  NativeWidgetWin::Init(parent, bounds);
+  WidgetWin::Init(parent, bounds);
   SetContentsView(contents_view);
   ShowMenuHost(do_capture);
 }
@@ -63,7 +63,7 @@ void MenuHostWin::HideMenuHost() {
   // Make sure we release capture before hiding.
   ReleaseMenuHostCapture();
 
-  NativeWidgetWin::Hide();
+  WidgetWin::Hide();
 }
 
 void MenuHostWin::DestroyMenuHost() {
@@ -94,11 +94,11 @@ void MenuHostWin::OnDestroy() {
     // the SubmenuView to drop references to us.
     submenu_->MenuHostDestroyed();
   }
-  NativeWidgetWin::OnDestroy();
+  WidgetWin::OnDestroy();
 }
 
 void MenuHostWin::OnCaptureChanged(HWND hwnd) {
-  NativeWidgetWin::OnCaptureChanged(hwnd);
+  WidgetWin::OnCaptureChanged(hwnd);
   owns_capture_ = false;
 }
 
diff --git a/views/controls/menu/menu_host_win.h b/views/controls/menu/menu_host_win.h
index 73f4a1c..ca8e12c 100644
--- a/views/controls/menu/menu_host_win.h
+++ b/views/controls/menu/menu_host_win.h
@@ -8,14 +8,14 @@
 #pragma once
 
 #include "views/controls/menu/menu_host.h"
-#include "views/widget/native_widget_win.h"
+#include "views/widget/widget_win.h"
 
 namespace views {
 
 class SubmenuView;
 
 // MenuHost implementation for windows.
-class MenuHostWin : public NativeWidgetWin, public MenuHost {
+class MenuHostWin : public WidgetWin, public MenuHost {
  public:
   explicit MenuHostWin(SubmenuView* submenu);
   virtual ~MenuHostWin();
@@ -33,7 +33,7 @@ class MenuHostWin : public NativeWidgetWin, public MenuHost {
   virtual void ReleaseMenuHostCapture();
   virtual gfx::NativeWindow GetMenuHostWindow();
 
-  // NativeWidgetWin overrides:
+  // WidgetWin overrides:
   virtual void OnDestroy();
   virtual void OnCaptureChanged(HWND hwnd);
   virtual void OnCancelMode();
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_win.cc b/views/controls/tabbed_pane/native_tabbed_pane_win.cc
index bc8b33f..aa651ac 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_win.cc
+++ b/views/controls/tabbed_pane/native_tabbed_pane_win.cc
@@ -15,8 +15,8 @@
 #include "ui/gfx/native_theme_win.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
 #include "views/layout/fill_layout.h"
-#include "views/widget/native_widget_win.h"
 #include "views/widget/root_view.h"
+#include "views/widget/widget_win.h"
 
 namespace views {
 
@@ -288,7 +288,7 @@ void NativeTabbedPaneWin::CreateNativeControl() {
   SendMessage(tab_control, WM_SETFONT, reinterpret_cast<WPARAM>(font), FALSE);
 
   // Create the view container which is a child of the TabControl.
-  content_window_ = new NativeWidgetWin;
+  content_window_ = new WidgetWin();
   content_window_->Init(tab_control, gfx::Rect());
 
   // Explicitly setting the WS_EX_LAYOUTRTL property for the HWND (see above
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_win.h b/views/controls/tabbed_pane/native_tabbed_pane_win.h
index 37e0f79..8eac285 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_win.h
+++ b/views/controls/tabbed_pane/native_tabbed_pane_win.h
@@ -13,7 +13,7 @@
 
 namespace views {
 
-class NativeWidgetWin;
+class WidgetWin;
 class TabLayout;
 
 class NativeTabbedPaneWin : public NativeControlWin,
@@ -86,7 +86,7 @@ class NativeTabbedPaneWin : public NativeControlWin,
   int selected_index_;
 
   // The window displayed in the tab.
-  NativeWidgetWin* content_window_;
+  WidgetWin* content_window_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeTabbedPaneWin);
 };