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

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

Issue 10913243: extensions: Add ExtensionView interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: weak Created 8 years, 3 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/extensions/extension_view_views.cc ('k') | chrome/chrome_browser_extensions.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 2bef24c41d2c2322cc651b1fac216ee0fdcf8a76..578a2115681bed8524280ea58985f8e230cd849a 100644
--- a/chrome/browser/ui/views/infobars/extension_infobar.cc
+++ b/chrome/browser/ui/views/infobars/extension_infobar.cc
@@ -9,6 +9,7 @@
#include "chrome/browser/extensions/extension_infobar_delegate.h"
#include "chrome/browser/infobars/infobar_tab_helper.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 "chrome/common/extensions/extension.h"
#include "chrome/common/extensions/extension_constants.h"
@@ -101,11 +102,12 @@ void ExtensionInfoBar::Layout() {
menu_->SetBounds(StartX(), OffsetY(menu_size), menu_size.width(),
menu_size.height());
- GetDelegate()->extension_host()->view()->SetBounds(
- menu_->bounds().right() + kMenuHorizontalMargin,
- arrow_height(),
- std::max(0, EndX() - StartX() - ContentMinimumWidth()),
- height() - arrow_height() - 1);
+ ExtensionViewViews* view = static_cast<ExtensionViewViews*>(
+ GetDelegate()->extension_host()->GetExtensionView());
+ view->SetBounds(menu_->bounds().right() + kMenuHorizontalMargin,
+ arrow_height(),
+ std::max(0, EndX() - StartX() - ContentMinimumWidth()),
+ height() - arrow_height() - 1);
}
void ExtensionInfoBar::ViewHierarchyChanged(bool is_add,
@@ -122,7 +124,9 @@ void ExtensionInfoBar::ViewHierarchyChanged(bool is_add,
AddChildView(menu_);
extensions::ExtensionHost* extension_host = GetDelegate()->extension_host();
- AddChildView(extension_host->view());
+ ExtensionViewViews* view =
+ static_cast<ExtensionViewViews*>(extension_host->GetExtensionView());
+ AddChildView(view);
// This must happen after adding all other children so InfoBarView can ensure
// the close button is the last child.
« no previous file with comments | « chrome/browser/ui/views/extensions/extension_view_views.cc ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698