Move Infobars core files to the Infobars component

chrome/browser/translate/translate_infobar_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/translate/translate_infobar_delegate.h"
 
 #include <algorithm>
 
 #include "base/i18n/string_compare.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/translate/translate_tab_helper.h"
+#include "components/infobars/core/infobar.h"
 #include "components/translate/core/browser/translate_accept_languages.h"
 #include "components/translate/core/browser/translate_download_manager.h"
 #include "components/translate/core/browser/translate_manager.h"
 #include "components/translate/core/common/translate_constants.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/icu/source/i18n/unicode/coll.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 51 matching lines @@
   if ((step == translate::TRANSLATE_STEP_AFTER_TRANSLATE) ||
       (step == translate::TRANSLATE_STEP_TRANSLATING)) {
     TranslateTabHelper* translate_tab_helper =
         TranslateTabHelper::FromWebContents(web_contents);
     if (!translate_tab_helper ||
         translate_tab_helper->GetLanguageState().InTranslateNavigation())
       return;
   }
 
   // Find any existing translate infobar delegate.
-  InfoBar* old_infobar = NULL;
+  infobars::InfoBar* old_infobar = NULL;
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents);
   TranslateInfoBarDelegate* old_delegate = NULL;
   for (size_t i = 0; i < infobar_service->infobar_count(); ++i) {
     old_infobar = infobar_service->infobar_at(i);
     old_delegate = old_infobar->delegate()->AsTranslateInfoBarDelegate();
     if (old_delegate) {
       if (!replace_existing_infobar)
         return;
       break;
     }
   }
 
   // Add the new delegate.
-  scoped_ptr<InfoBar> infobar(CreateInfoBar(
+  scoped_ptr<infobars::InfoBar> infobar(CreateInfoBar(
       scoped_ptr<TranslateInfoBarDelegate>(new TranslateInfoBarDelegate(
           web_contents, step, old_delegate, original_language,
           target_language, error_type, prefs,
           triggered_from_menu))));
   if (old_delegate)
     infobar_service->ReplaceInfoBar(old_infobar, infobar.Pass());
   else
     infobar_service->AddInfoBar(infobar.Pass());
 }
 
@@ skipping 213 matching lines @@
 
 TranslateInfoBarDelegate::TranslateInfoBarDelegate(
     content::WebContents* web_contents,
     translate::TranslateStep step,
     TranslateInfoBarDelegate* old_delegate,
     const std::string& original_language,
     const std::string& target_language,
     TranslateErrors::Type error_type,
     PrefService* prefs,
     bool triggered_from_menu)
-    : InfoBarDelegate(),
+    : infobars::InfoBarDelegate(),
       step_(step),
       background_animation_(NONE),
       ui_delegate_(TranslateTabHelper::FromWebContents(web_contents),
                    TranslateTabHelper::GetManagerFromWebContents(web_contents),
                    original_language,
                    target_language),
       error_type_(error_type),
       prefs_(TranslateTabHelper::CreateTranslatePrefs(prefs)),
       triggered_from_menu_(triggered_from_menu) {
   DCHECK_NE((step_ == translate::TRANSLATE_STEP_TRANSLATE_ERROR),
@@ skipping 12 matching lines @@
 
   // The user closed the infobar without clicking the translate button.
   TranslationDeclined();
   UMA_HISTOGRAM_BOOLEAN("Translate.DeclineTranslateCloseInfobar", true);
 }
 
 int TranslateInfoBarDelegate::GetIconID() const {
   return IDR_INFOBAR_TRANSLATE;
 }
 
-InfoBarDelegate::Type TranslateInfoBarDelegate::GetInfoBarType() const {
+infobars::InfoBarDelegate::Type TranslateInfoBarDelegate::GetInfoBarType()
+    const {
   return PAGE_ACTION_TYPE;
 }
 
 bool TranslateInfoBarDelegate::ShouldExpire(
     const NavigationDetails& details) const {
   // Note: we allow closing this infobar even if the main frame navigation
   // was programmatic and not initiated by the user - crbug.com/70261 .
   if (!details.is_navigation_to_different_page && !details.is_main_frame)
     return false;
 
-  return InfoBarDelegate::ShouldExpireInternal(details);
+  return infobars::InfoBarDelegate::ShouldExpireInternal(details);
 }
 
 TranslateInfoBarDelegate*
     TranslateInfoBarDelegate::AsTranslateInfoBarDelegate() {
   return this;
 }