| Index: chrome/browser/ui/startup/obsolete_system_infobar_delegate.cc
|
| diff --git a/chrome/browser/ui/startup/obsolete_system_infobar_delegate.cc b/chrome/browser/ui/startup/obsolete_system_infobar_delegate.cc
|
| index 1ec2c4613b9e11542cac9d7509b6338689d74a39..136842e4803bdd26e3979aab655873a9f204482c 100644
|
| --- a/chrome/browser/ui/startup/obsolete_system_infobar_delegate.cc
|
| +++ b/chrome/browser/ui/startup/obsolete_system_infobar_delegate.cc
|
| @@ -4,7 +4,6 @@
|
|
|
| #include "chrome/browser/ui/startup/obsolete_system_infobar_delegate.h"
|
|
|
| -#include "base/cpu.h"
|
| #include "chrome/browser/infobars/infobar_service.h"
|
| #include "chrome/common/url_constants.h"
|
| #include "chrome/grit/chromium_strings.h"
|
| @@ -24,17 +23,12 @@ void ObsoleteSystemInfoBarDelegate::Create(InfoBarService* infobar_service) {
|
| !ObsoleteSystemMac::Has32BitOnlyCPU()) {
|
| return;
|
| }
|
| -#elif defined(OS_WIN)
|
| - // On Windows we no longer support non-SSE2 machines since Chrome 35.
|
| - if (base::CPU().has_sse2())
|
| - return;
|
| + infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
|
| + scoped_ptr<ConfirmInfoBarDelegate>(new ObsoleteSystemInfoBarDelegate())));
|
| #else
|
| // No other platforms currently show this infobar.
|
| return;
|
| #endif
|
| -
|
| - infobar_service->AddInfoBar(ConfirmInfoBarDelegate::CreateInfoBar(
|
| - scoped_ptr<ConfirmInfoBarDelegate>(new ObsoleteSystemInfoBarDelegate())));
|
| }
|
|
|
| ObsoleteSystemInfoBarDelegate::ObsoleteSystemInfoBarDelegate()
|
| @@ -47,8 +41,6 @@ ObsoleteSystemInfoBarDelegate::~ObsoleteSystemInfoBarDelegate() {
|
| base::string16 ObsoleteSystemInfoBarDelegate::GetMessageText() const {
|
| #if defined(OS_MACOSX)
|
| return ObsoleteSystemMac::LocalizedObsoleteSystemString();
|
| -#elif defined(OS_WIN)
|
| - return l10n_util::GetStringUTF16(IDS_WIN_SSE_OBSOLETE_NOW);
|
| #else
|
| return l10n_util::GetStringUTF16(IDS_SYSTEM_OBSOLETE_MESSAGE);
|
| #endif
|
|
|