| 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 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 217 } | 218 } |
| 218 | 219 |
| 219 const DialogClientView* DialogDelegate::GetDialogClientView() const { | 220 const DialogClientView* DialogDelegate::GetDialogClientView() const { |
| 220 return GetWidget()->client_view()->AsDialogClientView(); | 221 return GetWidget()->client_view()->AsDialogClientView(); |
| 221 } | 222 } |
| 222 | 223 |
| 223 DialogClientView* DialogDelegate::GetDialogClientView() { | 224 DialogClientView* DialogDelegate::GetDialogClientView() { |
| 224 return GetWidget()->client_view()->AsDialogClientView(); | 225 return GetWidget()->client_view()->AsDialogClientView(); |
| 225 } | 226 } |
| 226 | 227 |
| 228 int DialogDelegate::GetWidthFactor() const { |
| 229 if (!ui::MaterialDesignController::IsSecondaryUiMaterial()) |
| 230 return 0; |
| 231 return static_cast<int>(dialog_width_); |
| 232 } |
| 233 |
| 227 ui::AXRole DialogDelegate::GetAccessibleWindowRole() const { | 234 ui::AXRole DialogDelegate::GetAccessibleWindowRole() const { |
| 228 return ui::AX_ROLE_DIALOG; | 235 return ui::AX_ROLE_DIALOG; |
| 229 } | 236 } |
| 230 | 237 |
| 231 //////////////////////////////////////////////////////////////////////////////// | 238 //////////////////////////////////////////////////////////////////////////////// |
| 232 // DialogDelegateView: | 239 // DialogDelegateView: |
| 233 | 240 |
| 234 DialogDelegateView::DialogDelegateView() { | 241 DialogDelegateView::DialogDelegateView() { |
| 235 // A WidgetDelegate should be deleted on DeleteDelegate. | 242 // A WidgetDelegate should be deleted on DeleteDelegate. |
| 236 set_owned_by_client(); | 243 set_owned_by_client(); |
| (...skipping 22 matching lines...) Expand all Loading... |
| 259 state->role = ui::AX_ROLE_DIALOG; | 266 state->role = ui::AX_ROLE_DIALOG; |
| 260 } | 267 } |
| 261 | 268 |
| 262 void DialogDelegateView::ViewHierarchyChanged( | 269 void DialogDelegateView::ViewHierarchyChanged( |
| 263 const ViewHierarchyChangedDetails& details) { | 270 const ViewHierarchyChangedDetails& details) { |
| 264 if (details.is_add && details.child == this && GetWidget()) | 271 if (details.is_add && details.child == this && GetWidget()) |
| 265 NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true); | 272 NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true); |
| 266 } | 273 } |
| 267 | 274 |
| 268 } // namespace views | 275 } // namespace views |
| OLD | NEW |