Move Infobars core files to the Infobars component

chrome/browser/geolocation/geolocation_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/geolocation/geolocation_infobar_delegate.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/content_settings/permission_queue_controller.h"
 #include "chrome/browser/google/google_util.h"
-#include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
+#include "components/infobars/core/infobar.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_ANDROID)
@@ skipping 33 matching lines @@
 };
 
 void RecordUmaEvent(GeolocationInfoBarDelegateEvent event) {
   UMA_HISTOGRAM_ENUMERATION("Geolocation.InfoBarDelegate.Event",
       event, GEOLOCATION_INFO_BAR_DELEGATE_EVENT_COUNT);
 }
 
 }  // namespace
 
 // static
-InfoBar* GeolocationInfoBarDelegate::Create(
+infobars::InfoBar* GeolocationInfoBarDelegate::Create(
     InfoBarService* infobar_service,
     PermissionQueueController* controller,
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     const std::string& display_languages,
     const std::string& accept_button_label) {
   RecordUmaEvent(GEOLOCATION_INFO_BAR_DELEGATE_EVENT_CREATE);
   const content::NavigationEntry* committed_entry =
       infobar_service->web_contents()->GetController().GetLastCommittedEntry();
   GeolocationInfoBarDelegate* const delegate = new DelegateType(
           controller, id, requesting_frame,
           committed_entry ? committed_entry->GetUniqueID() : 0,
           display_languages, accept_button_label);
 
-  InfoBar* infobar = ConfirmInfoBarDelegate::CreateInfoBar(
+  infobars::InfoBar* infobar = ConfirmInfoBarDelegate::CreateInfoBar(
       scoped_ptr<ConfirmInfoBarDelegate>(delegate)).release();
-  return infobar_service->AddInfoBar(scoped_ptr<InfoBar>(infobar));
+  return infobar_service->AddInfoBar(scoped_ptr<infobars::InfoBar>(infobar));
 }
 
 GeolocationInfoBarDelegate::GeolocationInfoBarDelegate(
     PermissionQueueController* controller,
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     int contents_unique_id,
     const std::string& display_languages,
     const std::string& accept_button_label)
     : ConfirmInfoBarDelegate(),
@@ skipping 30 matching lines @@
 void GeolocationInfoBarDelegate::InfoBarDismissed() {
   RecordUmaEvent(GEOLOCATION_INFO_BAR_DELEGATE_EVENT_DISMISS);
   set_user_has_interacted();
   SetPermission(false, false);
 }
 
 int GeolocationInfoBarDelegate::GetIconID() const {
   return IDR_INFOBAR_GEOLOCATION;
 }
 
-InfoBarDelegate::Type GeolocationInfoBarDelegate::GetInfoBarType() const {
+infobars::InfoBarDelegate::Type GeolocationInfoBarDelegate::GetInfoBarType()
+    const {
   return PAGE_ACTION_TYPE;
 }
 
 bool GeolocationInfoBarDelegate::ShouldExpireInternal(
     const NavigationDetails& details) const {
   // This implementation matches InfoBarDelegate::ShouldExpireInternal(), but
   // uses the unique ID we set in the constructor instead of that stored in the
   // base class.
   return (contents_unique_id_ != details.entry_id) || details.is_reload;
 }
@@ skipping 33 matching lines @@
 #endif
 
   InfoBarService::WebContentsFromInfoBar(infobar())->OpenURL(
       content::OpenURLParams(
           google_util::AppendGoogleLocaleParam(GURL(kGeolocationLearnMoreUrl)),
           content::Referrer(),
           (disposition == CURRENT_TAB) ? NEW_FOREGROUND_TAB : disposition,
           content::PAGE_TRANSITION_LINK, false));
   return false;  // Do not dismiss the info bar.
 }