| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "chrome/browser/ui/views/conflicting_module_view_win.h" | 5 #include "chrome/browser/ui/views/conflicting_module_view_win.h" |
| 6 | 6 |
| 7 #include "base/metrics/histogram_macros.h" | 7 #include "base/metrics/histogram_macros.h" |
| 8 #include "chrome/browser/chrome_notification_types.h" | 8 #include "chrome/browser/chrome_notification_types.h" |
| 9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| 11 #include "chrome/browser/ui/layout_constants.h" | 11 #include "chrome/browser/ui/layout_constants.h" |
| 12 #include "chrome/common/pref_names.h" | 12 #include "chrome/common/pref_names.h" |
| 13 #include "chrome/grit/chromium_strings.h" | 13 #include "chrome/grit/chromium_strings.h" |
| 14 #include "chrome/grit/generated_resources.h" | 14 #include "chrome/grit/generated_resources.h" |
| 15 #include "chrome/grit/locale_settings.h" | 15 #include "chrome/grit/locale_settings.h" |
| 16 #include "chrome/grit/theme_resources.h" | 16 #include "chrome/grit/theme_resources.h" |
| 17 #include "components/strings/grit/components_strings.h" | 17 #include "components/strings/grit/components_strings.h" |
| 18 #include "content/public/browser/notification_service.h" | 18 #include "content/public/browser/notification_service.h" |
| 19 #include "content/public/browser/user_metrics.h" | 19 #include "content/public/browser/user_metrics.h" |
| 20 #include "ui/accessibility/ax_view_state.h" | 20 #include "ui/accessibility/ax_node_data.h" |
| 21 #include "ui/base/l10n/l10n_util.h" | 21 #include "ui/base/l10n/l10n_util.h" |
| 22 #include "ui/base/resource/resource_bundle.h" | 22 #include "ui/base/resource/resource_bundle.h" |
| 23 #include "ui/views/controls/image_view.h" | 23 #include "ui/views/controls/image_view.h" |
| 24 #include "ui/views/controls/label.h" | 24 #include "ui/views/controls/label.h" |
| 25 #include "ui/views/layout/box_layout.h" | 25 #include "ui/views/layout/box_layout.h" |
| 26 #include "ui/views/layout/layout_constants.h" | 26 #include "ui/views/layout/layout_constants.h" |
| 27 #include "ui/views/widget/widget.h" | 27 #include "ui/views/widget/widget.h" |
| 28 | 28 |
| 29 using base::UserMetricsAction; | 29 using base::UserMetricsAction; |
| 30 | 30 |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 AddChildView(explanation); | 151 AddChildView(explanation); |
| 152 | 152 |
| 153 content::RecordAction( | 153 content::RecordAction( |
| 154 UserMetricsAction("ConflictingModuleNotificationShown")); | 154 UserMetricsAction("ConflictingModuleNotificationShown")); |
| 155 | 155 |
| 156 UMA_HISTOGRAM_ENUMERATION("ConflictingModule.UserSelection", | 156 UMA_HISTOGRAM_ENUMERATION("ConflictingModule.UserSelection", |
| 157 EnumerateModulesModel::ACTION_BUBBLE_SHOWN, | 157 EnumerateModulesModel::ACTION_BUBBLE_SHOWN, |
| 158 EnumerateModulesModel::ACTION_BOUNDARY); | 158 EnumerateModulesModel::ACTION_BOUNDARY); |
| 159 } | 159 } |
| 160 | 160 |
| 161 void ConflictingModuleView::GetAccessibleState( | 161 void ConflictingModuleView::GetAccessibleNodeData(ui::AXNodeData* node_data) { |
| 162 ui::AXViewState* state) { | 162 node_data->role = ui::AX_ROLE_ALERT_DIALOG; |
| 163 state->role = ui::AX_ROLE_ALERT_DIALOG; | |
| 164 } | 163 } |
| 165 | 164 |
| 166 void ConflictingModuleView::OnConflictsAcknowledged() { | 165 void ConflictingModuleView::OnConflictsAcknowledged() { |
| 167 EnumerateModulesModel* model = EnumerateModulesModel::GetInstance(); | 166 EnumerateModulesModel* model = EnumerateModulesModel::GetInstance(); |
| 168 if (!model->ShouldShowConflictWarning()) | 167 if (!model->ShouldShowConflictWarning()) |
| 169 GetWidget()->Close(); | 168 GetWidget()->Close(); |
| 170 } | 169 } |
| OLD | NEW |