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

Unified Diff: chrome/browser/ui/views/infobars/extension_infobar.cc

Issue 363233002: Abstract base 'ExtensionView' to Fix DEPS violation in extension_view_host.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase for r281699 (unused hwnd_util.h) Created 6 years, 5 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
« no previous file with comments | « chrome/browser/ui/views/infobars/extension_infobar.h ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/infobars/extension_infobar.cc
diff --git a/chrome/browser/ui/views/infobars/extension_infobar.cc b/chrome/browser/ui/views/infobars/extension_infobar.cc
index 720d8b946c652f718feaf1d6cc62fe9c8d25a88f..d1758a16f10ec02be4e0d83835b4734428811e14 100644
--- a/chrome/browser/ui/views/infobars/extension_infobar.cc
+++ b/chrome/browser/ui/views/infobars/extension_infobar.cc
@@ -8,6 +8,7 @@
#include "chrome/browser/extensions/extension_infobar_delegate.h"
#include "chrome/browser/extensions/extension_view_host.h"
#include "chrome/browser/platform_util.h"
+#include "chrome/browser/ui/views/extensions/extension_view_views.h"
#include "chrome/browser/ui/views/frame/browser_view.h"
#include "extensions/browser/image_loader.h"
#include "extensions/common/constants.h"
@@ -99,8 +100,7 @@ void ExtensionInfoBar::Layout() {
InfoBarView::Layout();
infobar_icon_->SetPosition(gfx::Point(StartX(), OffsetY(infobar_icon_)));
- ExtensionViewViews* extension_view =
- GetDelegate()->extension_view_host()->view();
+ ExtensionViewViews* extension_view = GetExtensionView();
// TODO(pkasting): We'd like to simply set the extension view's desired height
// at creation time and position using OffsetY() like for other infobar items,
// but the NativeViewHost inside does not seem to be clipped by the ClipRect()
@@ -143,8 +143,8 @@ void ExtensionInfoBar::ViewHierarchyChanged(
// AddChildView() call triggers InfoBarView::ViewHierarchyChanged(), it can
// read the correct height off this object in order to calculate the overall
// desired infobar height.
- extension_view_host->view()->SetSize(gfx::Size(0, GetDelegate()->height()));
- AddChildView(extension_view_host->view());
+ GetExtensionView()->SetSize(gfx::Size(0, GetDelegate()->height()));
+ AddChildView(GetExtensionView());
// This must happen after adding all other children so InfoBarView can ensure
// the close button is the last child.
@@ -170,9 +170,8 @@ void ExtensionInfoBar::ViewHierarchyChanged(
}
int ExtensionInfoBar::ContentMinimumWidth() const {
- return NonExtensionViewWidth() +
- delegate()->AsExtensionInfoBarDelegate()->extension_view_host()->
- view()->GetMinimumSize().width();
+ return NonExtensionViewWidth() + static_cast<const ExtensionViewViews*>(
+ GetDelegate()->extension_view_host()->view())->GetMinimumSize().width();
}
void ExtensionInfoBar::OnMenuButtonClicked(views::View* source,
@@ -227,6 +226,11 @@ const ExtensionInfoBarDelegate* ExtensionInfoBar::GetDelegate() const {
return delegate()->AsExtensionInfoBarDelegate();
}
+ExtensionViewViews* ExtensionInfoBar::GetExtensionView() {
+ return static_cast<ExtensionViewViews*>(
+ GetDelegate()->extension_view_host()->view());
+}
+
int ExtensionInfoBar::NonExtensionViewWidth() const {
return infobar_icon_->width() + kIconHorizontalMargin;
}
« no previous file with comments | « chrome/browser/ui/views/infobars/extension_infobar.h ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698