chrome/browser/ui/views/frame/browser_view.cc - Issue 10456017: Add WebsiteSettingsUI for Windows

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 10456017: Add WebsiteSettingsUI for Windows (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: " Created 8 years, 6 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:

Index: chrome/browser/ui/views/frame/browser_view.cc

diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc

index c3a7a1083fcc362051d451f9431fef784bff26a6..05a94df9e265b6296a6a500165050e0fc879fdf3 100644

--- a/chrome/browser/ui/views/frame/browser_view.cc

+++ b/chrome/browser/ui/views/frame/browser_view.cc

@@ -59,6 +59,7 @@

#include "chrome/browser/ui/views/tabs/tab_strip.h"

#include "chrome/browser/ui/views/toolbar_view.h"

#include "chrome/browser/ui/views/update_recommended_message_box.h"

+#include "chrome/browser/ui/views/website_settings_popup_view.h"

#include "chrome/browser/ui/webui/feedback_ui.h"

#include "chrome/browser/ui/window_sizer.h"

#include "chrome/common/chrome_notification_types.h"

@@ -1148,6 +1149,9 @@ void BrowserView::ShowWebsiteSettings(Profile* profile,

const GURL& url,

const content::SSLStatus& ssl,

bool show_history) {

+ WebsiteSettingsPopupView::ShowPopup(

+ GetLocationBarView()->location_icon_view(), profile,

+ tab_contents_wrapper, url, ssl);

}

void BrowserView::ShowAppMenu() {