Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

Unified Diff: ui/views/window/dialog_frame_view.h

Issue 11756005: Implement rough new dialog style. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix CrOS build. Created 7 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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
index 78ca0edf08b240dea07c4984bd567bae2f78714a..50b619ecf532d7cc38a4cc42016c350fc183b8d1 100644
--- a/ui/views/window/dialog_frame_view.h
+++ b/ui/views/window/dialog_frame_view.h
@@ -8,22 +8,16 @@
#include "ui/views/controls/button/button.h"
#include "ui/views/window/non_client_view.h"
-namespace gfx {
-class Font;
-}
-
namespace views {
-class ImageButton;
+class Label;
+class LabelButton;
// A NonClientFrameView that implements a new-style for dialogs.
class VIEWS_EXPORT DialogFrameView : public NonClientFrameView,
public ButtonListener {
public:
- // Internal class name.
- static const char kViewClassName[];
-
- DialogFrameView();
+ DialogFrameView(const string16& title);
sky 2013/01/07 16:51:03 explicit
msw 2013/01/07 18:06:32 Done.
virtual ~DialogFrameView();
// Overridden from NonClientFrameView:
@@ -40,19 +34,18 @@ class VIEWS_EXPORT DialogFrameView : public NonClientFrameView,
// Overridden from View:
virtual std::string GetClassName() const OVERRIDE;
virtual void Layout() OVERRIDE;
- virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
// Overridden from ButtonListener:
virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE;
private:
- gfx::Insets GetPaddingInsets() const;
gfx::Insets GetClientInsets() const;
- scoped_ptr<gfx::Font> title_font_;
- gfx::Rect title_display_rect_;
+ Label* title_;
+ LabelButton* close_;
- ImageButton* close_button_;
+ // The margins between the content and the inside of the border.
+ gfx::Insets content_margins_;
DISALLOW_COPY_AND_ASSIGN(DialogFrameView);
};

Powered by Google App Engine
This is Rietveld 408576698