Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/views/window/dialog_delegate.h" | 5 #include "ui/views/window/dialog_delegate.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "build/build_config.h" | 10 #include "build/build_config.h" |
| 11 #include "ui/accessibility/ax_view_state.h" | 11 #include "ui/accessibility/ax_view_state.h" |
| 12 #include "ui/base/l10n/l10n_util.h" | 12 #include "ui/base/l10n/l10n_util.h" |
| 13 #include "ui/base/material_design/material_design_controller.h" | |
| 13 #include "ui/gfx/color_palette.h" | 14 #include "ui/gfx/color_palette.h" |
| 14 #include "ui/strings/grit/ui_strings.h" | 15 #include "ui/strings/grit/ui_strings.h" |
| 15 #include "ui/views/bubble/bubble_border.h" | 16 #include "ui/views/bubble/bubble_border.h" |
| 16 #include "ui/views/bubble/bubble_frame_view.h" | 17 #include "ui/views/bubble/bubble_frame_view.h" |
| 17 #include "ui/views/controls/button/label_button.h" | 18 #include "ui/views/controls/button/label_button.h" |
| 18 #include "ui/views/layout/layout_constants.h" | 19 #include "ui/views/layout/layout_constants.h" |
| 19 #include "ui/views/style/platform_style.h" | 20 #include "ui/views/style/platform_style.h" |
| 20 #include "ui/views/widget/widget.h" | 21 #include "ui/views/widget/widget.h" |
| 21 #include "ui/views/widget/widget_observer.h" | 22 #include "ui/views/widget/widget_observer.h" |
| 22 #include "ui/views/window/dialog_client_view.h" | 23 #include "ui/views/window/dialog_client_view.h" |
| (...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 258 state->name = GetWindowTitle(); | 259 state->name = GetWindowTitle(); |
| 259 state->role = ui::AX_ROLE_DIALOG; | 260 state->role = ui::AX_ROLE_DIALOG; |
| 260 } | 261 } |
| 261 | 262 |
| 262 void DialogDelegateView::ViewHierarchyChanged( | 263 void DialogDelegateView::ViewHierarchyChanged( |
| 263 const ViewHierarchyChangedDetails& details) { | 264 const ViewHierarchyChangedDetails& details) { |
| 264 if (details.is_add && details.child == this && GetWidget()) | 265 if (details.is_add && details.child == this && GetWidget()) |
| 265 NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true); | 266 NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true); |
| 266 } | 267 } |
| 267 | 268 |
| 269 gfx::Size DialogDelegateView::GetPreferredSize() const { | |
| 270 if (!ui::MaterialDesignController::IsSecondaryUiMaterial() || | |
| 271 dialog_width() == DIALOG_WIDTH_UNSPECIFIED) { | |
| 272 return View::GetPreferredSize(); | |
| 273 } | |
| 274 int width_px = dialog_width() * 32; | |
|
Evan Stade
2016/10/03 19:04:19
actually dp, not px. I'd suggest leaving the unit
Elly Fong-Jones
2016/10/05 13:20:31
Done.
| |
| 275 return gfx::Size(width_px, GetHeightForWidth(width_px)); | |
| 276 } | |
| 277 | |
| 268 } // namespace views | 278 } // namespace views |
| OLD | NEW |