Make destructors of classes that implement aura::WindowDelegate private or protected.

This would be better since an instance of these classes shouldn't be deleted directly.

BUG=None
TEST=try


Review URL: https://chromiumcodereview.appspot.com/10545108

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

2 files changed, 12 insertions, 8 deletions

diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc
index 67254d1..8728811 100644
--- a/ui/views/widget/native_widget_aura.cc
+++ b/ui/views/widget/native_widget_aura.cc
@@ -153,13 +153,6 @@ NativeWidgetAura::NativeWidgetAura(internal::NativeWidgetDelegate* delegate)
       saved_window_state_(ui::SHOW_STATE_DEFAULT) {
 }
 
-NativeWidgetAura::~NativeWidgetAura() {
-  if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET)
-    delete delegate_;
-  else
-    CloseNow();
-}
-
 // static
 gfx::Font NativeWidgetAura::GetWindowTitleFont() {
 #if defined(OS_WIN)
@@ -867,6 +860,16 @@ int NativeWidgetAura::OnPerformDrop(const aura::DropTargetEvent& event) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// NativeWidgetAura, protected:
+
+NativeWidgetAura::~NativeWidgetAura() {
+  if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET)
+    delete delegate_;
+  else
+    CloseNow();
+}
+
+////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetAura, private:
 
 void NativeWidgetAura::SetInitialFocus() {
diff --git a/ui/views/widget/native_widget_aura.h b/ui/views/widget/native_widget_aura.h
index 1907e08..d299c85 100644
--- a/ui/views/widget/native_widget_aura.h
+++ b/ui/views/widget/native_widget_aura.h
@@ -34,7 +34,6 @@ class VIEWS_EXPORT NativeWidgetAura : public internal::NativeWidgetPrivate,
                                       public aura::client::DragDropDelegate {
  public:
   explicit NativeWidgetAura(internal::NativeWidgetDelegate* delegate);
-  virtual ~NativeWidgetAura();
 
   // TODO(beng): Find a better place for this, and the similar method on
   //             NativeWidgetWin.
@@ -160,6 +159,8 @@ class VIEWS_EXPORT NativeWidgetAura : public internal::NativeWidgetPrivate,
   virtual int OnPerformDrop(const aura::DropTargetEvent& event) OVERRIDE;
 
  protected:
+  virtual ~NativeWidgetAura();
+
   internal::NativeWidgetDelegate* delegate() { return delegate_; }
 
  private: