content/browser/web_contents/web_contents_view_mac.h - Issue 10031044: TabContents -> WebContentsImpl, part 5.

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: content/browser/web_contents/web_contents_view_mac.h

Issue 10031044: TabContents -> WebContentsImpl, part 5. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase (fixed) Created 8 years, 8 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: content/browser/web_contents/web_contents_view_mac.h

diff --git a/content/browser/web_contents/web_contents_view_mac.h b/content/browser/web_contents/web_contents_view_mac.h

index e8a089990407ba3fa89d747efc99ff0cf3ff1d80..df3c80bcab964c8b27abbf19d43dfeb63c1aef8a 100644

--- a/content/browser/web_contents/web_contents_view_mac.h

+++ b/content/browser/web_contents/web_contents_view_mac.h

@@ -15,7 +15,7 @@

#include "base/memory/scoped_nsobject.h"

#include "base/memory/scoped_ptr.h"

-#include "content/browser/tab_contents/tab_contents_view_helper.h"

+#include "content/browser/web_contents/web_contents_view_helper.h"

#include "content/public/browser/web_contents_view.h"

#include "ui/base/cocoa/base_view.h"

#include "ui/gfx/size.h"

@@ -123,7 +123,7 @@ class WebContentsViewMac : public content::WebContentsView {

WebContentsImpl* web_contents_;

// Common implementations of some WebContentsView methods.

- TabContentsViewHelper tab_contents_view_helper_;

+ WebContentsViewHelper web_contents_view_helper_;

// The Cocoa NSView that lives in the view hierarchy.

scoped_nsobject<WebContentsViewCocoa> cocoa_view_;