Replace DialogFrameView with an enhanced BubbleFrameView.

ui/views/window/dialog_frame_view.h

Index: ui/views/window/dialog_frame_view.h
diff --git a/ui/views/window/dialog_frame_view.h b/ui/views/window/dialog_frame_view.h
deleted file mode 100644
index 57bef4cd66fd510bbbcb6e4d1301e3465c5e839a..0000000000000000000000000000000000000000
--- a/ui/views/window/dialog_frame_view.h
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef UI_VIEWS_WINDOW_DIALOG_FRAME_VIEW_H_
-#define UI_VIEWS_WINDOW_DIALOG_FRAME_VIEW_H_
-
-#include "ui/views/controls/button/button.h"
-#include "ui/views/window/non_client_view.h"
-
-namespace views {
-
-class Label;
-class LabelButton;
-
-// A NonClientFrameView that implements a new-style for dialogs.
-class VIEWS_EXPORT DialogFrameView : public NonClientFrameView,
-                                     public ButtonListener {
- public:
-  explicit DialogFrameView(const string16& title);
-  virtual ~DialogFrameView();
-
-  // Overridden from NonClientFrameView:
-  virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
-  virtual gfx::Rect GetWindowBoundsForClientBounds(
-      const gfx::Rect& client_bounds) const OVERRIDE;
-  virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
-  virtual void GetWindowMask(const gfx::Size& size,
-                             gfx::Path* window_mask) OVERRIDE;
-  virtual void ResetWindowControls() OVERRIDE;
-  virtual void UpdateWindowIcon() OVERRIDE;
-  virtual void UpdateWindowTitle() OVERRIDE;
-
-  // Overridden from View:
-  virtual std::string GetClassName() const OVERRIDE;
-  virtual void Layout() OVERRIDE;
-
-  // Overridden from ButtonListener:
-  virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE;
-
- private:
-  gfx::Insets GetClientInsets() const;
-
-  Label* title_;
-  LabelButton* close_;
-
-  // The margins between the content and the inside of the border.
-  gfx::Insets content_margins_;
-
-  DISALLOW_COPY_AND_ASSIGN(DialogFrameView);
-};
-
-}  // namespace views
-
-#endif  // UI_VIEWS_WINDOW_DIALOG_FRAME_VIEW_H_