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

Unified Diff: chrome/browser/extensions/extension_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/extensions/extension_infobar_delegate.cc
diff --git a/chrome/browser/extensions/extension_infobar_delegate.cc b/chrome/browser/extensions/extension_infobar_delegate.cc
index 44096ca8af1ccf6517453dcdb9bde4295f63b3dd..1411b0aa2e70e74751f0c9a5411d6fd069a5c956 100644
--- a/chrome/browser/extensions/extension_infobar_delegate.cc
+++ b/chrome/browser/extensions/extension_infobar_delegate.cc
@@ -7,10 +7,10 @@
#include "chrome/browser/chrome_notification_types.h"
#include "chrome/browser/extensions/extension_view_host.h"
#include "chrome/browser/extensions/extension_view_host_factory.h"
-#include "chrome/browser/infobars/infobar.h"
#include "chrome/browser/infobars/infobar_service.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/browser.h"
+#include "components/infobars/core/infobar.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_source.h"
#include "extensions/common/extension.h"
@@ -36,7 +36,7 @@ ExtensionInfoBarDelegate::ExtensionInfoBarDelegate(
const GURL& url,
content::WebContents* web_contents,
int height)
- : InfoBarDelegate(),
+ : infobars::InfoBarDelegate(),
#if defined(TOOLKIT_VIEWS)
browser_(browser),
#endif
@@ -52,9 +52,9 @@ ExtensionInfoBarDelegate::ExtensionInfoBarDelegate(
content::Source<Profile>(browser->profile()));
height_ = std::max(0, height);
- height_ = std::min(2 * InfoBar::kDefaultBarTargetHeight, height_);
+ height_ = std::min(2 * infobars::InfoBar::kDefaultBarTargetHeight, height_);
if (height_ == 0)
- height_ = InfoBar::kDefaultBarTargetHeight;
+ height_ = infobars::InfoBar::kDefaultBarTargetHeight;
}
content::WebContents* ExtensionInfoBarDelegate::GetWebContents() {
@@ -64,7 +64,8 @@ content::WebContents* ExtensionInfoBarDelegate::GetWebContents() {
// ExtensionInfoBarDelegate::CreateInfoBar() is implemented in platform-specific
// files.
-bool ExtensionInfoBarDelegate::EqualsDelegate(InfoBarDelegate* delegate) const {
+bool ExtensionInfoBarDelegate::EqualsDelegate(
+ infobars::InfoBarDelegate* delegate) const {
ExtensionInfoBarDelegate* extension_delegate =
delegate->AsExtensionInfoBarDelegate();
// When an extension crashes, an InfoBar is shown (for the crashed extension).
@@ -84,7 +85,8 @@ void ExtensionInfoBarDelegate::InfoBarDismissed() {
closing_ = true;
}
-InfoBarDelegate::Type ExtensionInfoBarDelegate::GetInfoBarType() const {
+infobars::InfoBarDelegate::Type ExtensionInfoBarDelegate::GetInfoBarType()
+ const {
return PAGE_ACTION_TYPE;
}
« no previous file with comments | « chrome/browser/extensions/extension_infobar_delegate.h ('k') | chrome/browser/extensions/extension_install_prompt.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698