chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm - Issue 659233002: STASH: Epic Experimental patch for toolkit-views App List on Mac

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/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm

Issue 659233002: STASH: Epic Experimental patch for toolkit-views App List on Mac Base URL: https://chromium.googlesource.com/chromium/src.git/+/master

Patch Set: Fix a few things. Works@master Created 6 years, 2 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/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm

diff --git a/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm b/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm

index af0c147365b2fa98c2a078c5b9241650a619bb04..0f294312e8668aaeb01cc0158946f22018931dc7 100644

--- a/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm

+++ b/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.mm

@@ -90,9 +90,12 @@ ChromeWebContentsViewDelegateMac::GetActiveRenderWidgetHostView() {

namespace chrome {

+#if !defined(TOOLKIT_VIEWS)

content::WebContentsViewDelegate* CreateWebContentsViewDelegate(

- content::WebContents* web_contents) {

+ content::WebContents* web_contents,

+ gfx::NativeView context) {

return new ChromeWebContentsViewDelegateMac(web_contents);

}

+#endif // !defined(TOOLKIT_VIEWS)

} // namespace chrome

« no previous file with comments | « chrome/browser/ui/cocoa/DEPS ('k') | chrome/browser/ui/cocoa/task_manager_mac.mm » ('j') | no next file with comments »