ui/views/window/dialog_client_view.cc - Issue 14646037: Enable the new dialog style by default; etc.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 14646037: Enable the new dialog style by default; etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix LabelButton preferred size calculations; stack overflow for STYLE_BUTTON. Created 7 years, 7 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:

Index: ui/views/window/dialog_client_view.cc

diff --git a/ui/views/window/dialog_client_view.cc b/ui/views/window/dialog_client_view.cc

index 72f550eb946a42fcff299ff472a7858967aa6af7..ef10fc4a4529e79c0c438c63df713c387b516218 100644

--- a/ui/views/window/dialog_client_view.cc

+++ b/ui/views/window/dialog_client_view.cc

@@ -146,11 +146,6 @@ const DialogClientView* DialogClientView::AsDialogClientView() const {

void DialogClientView::OnWillChangeFocus(View* focused_before,

View* focused_now) {

- // New style dialogs do not move the default button with the focus.

- // TODO(msw|wittman): Remove this functionality once the new style has landed.

- if (DialogDelegate::UseNewStyle())

- return;

// Make the newly focused button default or restore the dialog's default.

const int default_button = GetDialogDelegate()->GetDefaultDialogButton();

LabelButton* new_default_button = NULL;