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

Unified Diff: chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

Issue 1280673003: [Mac] Enable MacViews site settings bubble behind --enable-mac-views-dialogs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@enabledialogs
Patch Set: Sync Created 5 years, 4 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/website_settings/website_settings_popup_view.cc
diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
index 70c5a52fee1247ecaf37fe9ebbda8243396e057b..662f593e2a6d6a46c0d3afd09147bfe180fdf823 100644
--- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
+++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc
@@ -273,16 +273,18 @@ WebsiteSettingsPopupView::~WebsiteSettingsPopupView() {
}
// static
-void WebsiteSettingsPopupView::ShowPopup(views::View* anchor_view,
- Profile* profile,
- content::WebContents* web_contents,
- const GURL& url,
- const content::SSLStatus& ssl) {
+views::BubbleDelegateView* WebsiteSettingsPopupView::ShowPopup(
+ views::View* anchor_view,
+ Profile* profile,
+ content::WebContents* web_contents,
+ const GURL& url,
+ const content::SSLStatus& ssl) {
is_popup_showing = true;
if (InternalChromePage(url)) {
- new InternalPageInfoPopupView(anchor_view);
+ return new InternalPageInfoPopupView(anchor_view);
} else {
- new WebsiteSettingsPopupView(anchor_view, profile, web_contents, url, ssl);
+ return new WebsiteSettingsPopupView(anchor_view, profile, web_contents, url,
+ ssl);
}
}

Powered by Google App Engine
This is Rietveld 408576698