| 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.h" | 7 #include "base/metrics/histogram.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/browser/win/enumerate_modules_model.h" | 12 #include "chrome/browser/win/enumerate_modules_model.h" | 
| 13 #include "chrome/common/pref_names.h" | 13 #include "chrome/common/pref_names.h" | 
| 14 #include "chrome/grit/chromium_strings.h" | 14 #include "chrome/grit/chromium_strings.h" | 
| 15 #include "chrome/grit/generated_resources.h" | 15 #include "chrome/grit/generated_resources.h" | 
| 16 #include "chrome/grit/locale_settings.h" | 16 #include "chrome/grit/locale_settings.h" | 
|  | 17 #include "chrome/grit/theme_resources.h" | 
|  | 18 #include "components/strings/grit/components_strings.h" | 
| 17 #include "content/public/browser/notification_service.h" | 19 #include "content/public/browser/notification_service.h" | 
| 18 #include "content/public/browser/user_metrics.h" | 20 #include "content/public/browser/user_metrics.h" | 
| 19 #include "grit/components_strings.h" |  | 
| 20 #include "grit/theme_resources.h" |  | 
| 21 #include "ui/accessibility/ax_view_state.h" | 21 #include "ui/accessibility/ax_view_state.h" | 
| 22 #include "ui/base/l10n/l10n_util.h" | 22 #include "ui/base/l10n/l10n_util.h" | 
| 23 #include "ui/base/resource/resource_bundle.h" | 23 #include "ui/base/resource/resource_bundle.h" | 
| 24 #include "ui/views/controls/image_view.h" | 24 #include "ui/views/controls/image_view.h" | 
| 25 #include "ui/views/controls/label.h" | 25 #include "ui/views/controls/label.h" | 
| 26 #include "ui/views/layout/box_layout.h" | 26 #include "ui/views/layout/box_layout.h" | 
| 27 #include "ui/views/layout/layout_constants.h" | 27 #include "ui/views/layout/layout_constants.h" | 
| 28 #include "ui/views/widget/widget.h" | 28 #include "ui/views/widget/widget.h" | 
| 29 | 29 | 
| 30 using base::UserMetricsAction; | 30 using base::UserMetricsAction; | 
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 165 | 165 | 
| 166 void ConflictingModuleView::Observe( | 166 void ConflictingModuleView::Observe( | 
| 167     int type, | 167     int type, | 
| 168     const content::NotificationSource& source, | 168     const content::NotificationSource& source, | 
| 169     const content::NotificationDetails& details) { | 169     const content::NotificationDetails& details) { | 
| 170   DCHECK_EQ(chrome::NOTIFICATION_MODULE_INCOMPATIBILITY_ICON_CHANGE, type); | 170   DCHECK_EQ(chrome::NOTIFICATION_MODULE_INCOMPATIBILITY_ICON_CHANGE, type); | 
| 171   EnumerateModulesModel* model = EnumerateModulesModel::GetInstance(); | 171   EnumerateModulesModel* model = EnumerateModulesModel::GetInstance(); | 
| 172   if (!model->ShouldShowConflictWarning()) | 172   if (!model->ShouldShowConflictWarning()) | 
| 173     GetWidget()->Close(); | 173     GetWidget()->Close(); | 
| 174 } | 174 } | 
| OLD | NEW | 
|---|