Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / startup / obsolete_system_infobar_delegate.cc

diff --git a/src/chrome/browser/ui/startup/obsolete_system_infobar_delegate.cc b/src/chrome/browser/ui/startup/obsolete_system_infobar_delegate.cc
index 06e858a..d10f849 100644 (file)
--- a/src/chrome/browser/ui/startup/obsolete_system_infobar_delegate.cc
+++ b/src/chrome/browser/ui/startup/obsolete_system_infobar_delegate.cc
@@ -4,13 +4,12 @@
 
 #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"
 #include "components/infobars/core/infobar.h"
 #include "content/public/browser/web_contents.h"
-#include "grit/chromium_strings.h"
-#include "grit/generated_resources.h"
+#include "grit/components_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_MACOSX)
@@ -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
@@ -74,6 +66,6 @@ bool ObsoleteSystemInfoBarDelegate::LinkClicked(
 #endif
           content::Referrer(),
           (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
-          content::PAGE_TRANSITION_LINK, false));
+          ui::PAGE_TRANSITION_LINK, false));
   return false;
 }