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

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

Issue 11571023: Move ash/wm's DialogFrameView to ui/views/window; etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove redundant GetContentsView() OVERRIDEs; re-git-add dialog_frame_view files. Created 8 years 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_client_view.h
diff --git a/ui/views/window/dialog_client_view.h b/ui/views/window/dialog_client_view.h
index 97c0d9b9f14841d6a336ef95950fabcc5c515571..65508190bed818afee63744dbb54bb779f9e7429 100644
--- a/ui/views/window/dialog_client_view.h
+++ b/ui/views/window/dialog_client_view.h
@@ -35,21 +35,7 @@ class VIEWS_EXPORT DialogClientView : public ClientView,
public ButtonListener,
public FocusChangeListener {
public:
- // Parameters for the internal dialog styling. Default construction
- // produces parameters for native dialog styling.
- struct VIEWS_EXPORT StyleParams {
- StyleParams();
-
- int button_vedge_margin;
- int button_hedge_margin;
- int button_shadow_margin;
- int button_content_spacing;
- int related_button_hspacing;
- };
-
- DialogClientView(Widget* widget,
- View* contents_view,
- const StyleParams &params);
+ DialogClientView(Widget* widget, View* contents_view);
virtual ~DialogClientView();
// Adds the dialog buttons required by the supplied DialogDelegate to the
@@ -70,9 +56,6 @@ class VIEWS_EXPORT DialogClientView : public ClientView,
TextButton* ok_button() const { return ok_button_; }
TextButton* cancel_button() const { return cancel_button_; }
- // Creates a StyleParams struct in Chrome style (default is native style).
- static StyleParams GetChromeStyleParams();
-
// Returns the number of pixels at the bottom of the dialog which are visually
// part of the frame, but are actually rendered by the DialogClientView.
int GetBottomMargin();
@@ -110,6 +93,17 @@ class VIEWS_EXPORT DialogClientView : public ClientView,
const ui::Event& event) OVERRIDE;
private:
+ // Parameters for the internal dialog styling.
+ struct StyleParams {
+ StyleParams();
+
+ int button_vedge_margin;
+ int button_hedge_margin;
+ int button_shadow_margin;
+ int button_content_spacing;
+ int related_button_hspacing;
+ };
+
// Create a dialog button of the appropriate type.
TextButton* CreateDialogButton(ui::DialogButton type, const string16& title);

Powered by Google App Engine
This is Rietveld 408576698