Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2458)

Unified Diff: chrome/browser/geolocation/geolocation_infobar_delegate.cc

Issue 240193003: Move Infobars core files to the Infobars component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix nib name on mac Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/geolocation/geolocation_infobar_delegate.cc
diff --git a/chrome/browser/geolocation/geolocation_infobar_delegate.cc b/chrome/browser/geolocation/geolocation_infobar_delegate.cc
index 8fd4f96f8a69504945740e503d6597b53abbaa9c..98d8329a558fc3f8667c467ce14871e5f0ddd63b 100644
--- a/chrome/browser/geolocation/geolocation_infobar_delegate.cc
+++ b/chrome/browser/geolocation/geolocation_infobar_delegate.cc
@@ -7,8 +7,8 @@
#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"
@@ -62,7 +62,7 @@ void RecordUmaEvent(GeolocationInfoBarDelegateEvent event) {
} // namespace
// static
-InfoBar* GeolocationInfoBarDelegate::Create(
+infobars::InfoBar* GeolocationInfoBarDelegate::Create(
InfoBarService* infobar_service,
PermissionQueueController* controller,
const PermissionRequestID& id,
@@ -77,9 +77,9 @@ InfoBar* GeolocationInfoBarDelegate::Create(
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(
@@ -130,7 +130,8 @@ int GeolocationInfoBarDelegate::GetIconID() const {
return IDR_INFOBAR_GEOLOCATION;
}
-InfoBarDelegate::Type GeolocationInfoBarDelegate::GetInfoBarType() const {
+infobars::InfoBarDelegate::Type GeolocationInfoBarDelegate::GetInfoBarType()
+ const {
return PAGE_ACTION_TYPE;
}
« no previous file with comments | « chrome/browser/geolocation/geolocation_infobar_delegate.h ('k') | chrome/browser/google/google_url_tracker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698