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

Unified Diff: chrome/browser/ui/views/page_info/page_info_popup_view.cc

Issue 2720183002: [Views] Update ink drop for omnibox icons (Closed)
Patch Set: Fixed issues. Also rebased Created 3 years, 9 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/ui/views/page_info/page_info_popup_view.cc
diff --git a/chrome/browser/ui/views/page_info/page_info_popup_view.cc b/chrome/browser/ui/views/page_info/page_info_popup_view.cc
index bea7900080fc990d5b0610f2413a1c7ed0004061..e7cdbcfd2d9938d82d8d4d192c6583eab4eed6ab 100644
--- a/chrome/browser/ui/views/page_info/page_info_popup_view.cc
+++ b/chrome/browser/ui/views/page_info/page_info_popup_view.cc
@@ -59,6 +59,7 @@
#include "ui/views/layout/layout_manager.h"
#include "ui/views/view.h"
#include "ui/views/widget/widget.h"
+#include "ui/views/widget/widget_observer.h"
#include "url/gurl.h"
namespace {
@@ -344,6 +345,7 @@ PageInfoPopupView::~PageInfoPopupView() {}
// static
void PageInfoPopupView::ShowPopup(
views::View* anchor_view,
+ views::WidgetObserver* widget_observer,
const gfx::Rect& anchor_rect,
Profile* profile,
content::WebContents* web_contents,
@@ -360,6 +362,8 @@ void PageInfoPopupView::ShowPopup(
new InternalPageInfoPopupView(anchor_view, parent_window, url);
if (!anchor_view)
popup->SetAnchorRect(anchor_rect);
+ if (widget_observer)
+ popup->GetWidget()->AddObserver(widget_observer);
popup->GetWidget()->Show();
return;
}
@@ -367,6 +371,10 @@ void PageInfoPopupView::ShowPopup(
anchor_view, parent_window, profile, web_contents, url, security_info);
if (!anchor_view)
popup->SetAnchorRect(anchor_rect);
+
+ if (widget_observer)
+ popup->GetWidget()->AddObserver(widget_observer);
+
popup->GetWidget()->Show();
}

Powered by Google App Engine
This is Rietveld 408576698