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

Unified Diff: chrome/browser/renderer_host/render_widget_host_view_mac.h

Issue 2730015: Mac/clang: Uncontentious fixes. (Closed)
Patch Set: '' Created 10 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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/renderer_host/render_widget_host_view_mac.h
diff --git a/chrome/browser/renderer_host/render_widget_host_view_mac.h b/chrome/browser/renderer_host/render_widget_host_view_mac.h
index 07f65e2268072c23399b5a8eca35597537b3a093..2f2da20c4633c326da577c36e6a8402fbe483bcc 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_mac.h
+++ b/chrome/browser/renderer_host/render_widget_host_view_mac.h
@@ -211,7 +211,7 @@ class RenderWidgetHostViewMac : public RenderWidgetHostView {
void KillSelf();
- void set_parent_view(BaseView* parent_view) { parent_view_ = parent_view; }
+ void set_parent_view(NSView* parent_view) { parent_view_ = parent_view; }
// These member variables should be private, but the associated ObjC class
// needs access to them and can't be made a friend.
@@ -279,7 +279,7 @@ class RenderWidgetHostViewMac : public RenderWidgetHostView {
ScopedRunnableMethodFactory<RenderWidgetHostViewMac> shutdown_factory_;
// Used for positioning a popup menu.
- BaseView* parent_view_;
+ NSView* parent_view_;
// Helper class for managing instances of accelerated plug-ins.
AcceleratedSurfaceContainerManagerMac plugin_container_manager_;

Powered by Google App Engine
This is Rietveld 408576698