Remove legacy constrained window dialogs

chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.h

Index: chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.h
diff --git a/chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.h b/chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.h
index 8aa6fe28c39d6ddf204537062192340d84a53e1a..fc08809ede59451c8166fd4edb79ec2106bf55d0 100644
--- a/chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.h
+++ b/chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.h
@@ -8,32 +8,29 @@
 #import <Cocoa/Cocoa.h>
 
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/ui/cocoa/constrained_window_mac.h"
 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac2.h"
 #include "chrome/browser/ui/tab_modal_confirm_dialog.h"
 
 @class ConstrainedWindowAlert;
-class TabModalConfirmDialogDelegate;
 
 namespace content {
 class WebContents;
 }
 
+class TabModalConfirmDialogDelegate;
+@class TabModalConfirmDialogMacBridge;
+
 // Displays a tab-modal dialog, i.e. a dialog that will block the current page
 // but still allow the user to switch to a different page.
 // To display the dialog, allocate this object on the heap. It will open the
 // dialog from its constructor and then delete itself when the user dismisses
 // the dialog.
-class TabModalConfirmDialogMac
-    : public TabModalConfirmDialog,
-      public ConstrainedWindowMacDelegateSystemSheet {
+class TabModalConfirmDialogMac : public TabModalConfirmDialog,
+                                 public ConstrainedWindowMacDelegate2 {
  public:
   TabModalConfirmDialogMac(TabModalConfirmDialogDelegate* delegate,
                            content::WebContents* web_contents);
 
-  // ConstrainedWindowDelegateMacSystemSheet:
-  virtual void DeleteDelegate() OVERRIDE;
-
  private:
   virtual ~TabModalConfirmDialogMac();
 
@@ -41,28 +38,6 @@ class TabModalConfirmDialogMac
   virtual void AcceptTabModalDialog() OVERRIDE;
   virtual void CancelTabModalDialog() OVERRIDE;
 
-  scoped_ptr<TabModalConfirmDialogDelegate> delegate_;
-
-  DISALLOW_COPY_AND_ASSIGN(TabModalConfirmDialogMac);
-};
-
-@class TabModalConfirmDialogMacBridge2;
-
-// This class is the same as TabModalConfirmDialogMac except that it uses
-// the new constrained window look and feel.
-class TabModalConfirmDialogMac2 : public TabModalConfirmDialog,
-                                  public ConstrainedWindowMacDelegate2 {
- public:
-  TabModalConfirmDialogMac2(TabModalConfirmDialogDelegate* delegate,
-                            content::WebContents* web_contents);
-
- private:
-  virtual ~TabModalConfirmDialogMac2();
-
-  // TabModalConfirmDialog:
-  virtual void AcceptTabModalDialog() OVERRIDE;
-  virtual void CancelTabModalDialog() OVERRIDE;
-
   // ConstrainedWindowMacDelegate2:
   virtual void OnConstrainedWindowClosed(
       ConstrainedWindowMac2* window) OVERRIDE;
@@ -70,9 +45,9 @@ class TabModalConfirmDialogMac2 : public TabModalConfirmDialog,
   scoped_ptr<ConstrainedWindowMac2> window_;
   scoped_ptr<TabModalConfirmDialogDelegate> delegate_;
   scoped_nsobject<ConstrainedWindowAlert> alert_;
-  scoped_nsobject<TabModalConfirmDialogMacBridge2> bridge_;
+  scoped_nsobject<TabModalConfirmDialogMacBridge> bridge_;
 
-  DISALLOW_COPY_AND_ASSIGN(TabModalConfirmDialogMac2);
+  DISALLOW_COPY_AND_ASSIGN(TabModalConfirmDialogMac);
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_TAB_MODAL_CONFIRM_DIALOG_MAC_H_