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

Side by Side Diff: chrome/browser/renderer_host/render_widget_host_view_mac.h

Issue 566018: [Mac] Revert diagnostics for content popup bug. (Closed)
Patch Set: Created 10 years, 10 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/renderer_host/render_widget_host_view_mac.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 5 #ifndef CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
6 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 6 #define CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
7 7
8 #import <Cocoa/Cocoa.h> 8 #import <Cocoa/Cocoa.h>
9 9
10 #include "base/scoped_nsobject.h" 10 #include "base/scoped_nsobject.h"
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 const std::vector<WebMenuItem>& items); 108 const std::vector<WebMenuItem>& items);
109 virtual gfx::Rect GetWindowRect(); 109 virtual gfx::Rect GetWindowRect();
110 virtual gfx::Rect GetRootWindowRect(); 110 virtual gfx::Rect GetRootWindowRect();
111 virtual void SetActive(bool active); 111 virtual void SetActive(bool active);
112 virtual void SetBackground(const SkBitmap& background); 112 virtual void SetBackground(const SkBitmap& background);
113 113
114 void KillSelf(); 114 void KillSelf();
115 115
116 void set_parent_view(BaseView* parent_view) { parent_view_ = parent_view; } 116 void set_parent_view(BaseView* parent_view) { parent_view_ = parent_view; }
117 117
118 // Used only to diagnose the crash in http://crbug.com/31716
119 // TODO(pamg): Remove when no longer needed.
120 void clear_cocoa_view() { cocoa_view_ = nil; }
121
122 // These member variables should be private, but the associated ObjC class 118 // These member variables should be private, but the associated ObjC class
123 // needs access to them and can't be made a friend. 119 // needs access to them and can't be made a friend.
124 120
125 // The associated Model. Can be NULL if Destroy() is called when 121 // The associated Model. Can be NULL if Destroy() is called when
126 // someone (other than superview) has retained |cocoa_view_|. 122 // someone (other than superview) has retained |cocoa_view_|.
127 RenderWidgetHost* render_widget_host_; 123 RenderWidgetHost* render_widget_host_;
128 124
129 // This is true when we are currently painting and thus should handle extra 125 // This is true when we are currently painting and thus should handle extra
130 // paint requests by expanding the invalid rect rather than actually painting. 126 // paint requests by expanding the invalid rect rather than actually painting.
131 bool about_to_validate_and_paint_; 127 bool about_to_validate_and_paint_;
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 // Factory used to safely scope delayed calls to ShutdownHost(). 216 // Factory used to safely scope delayed calls to ShutdownHost().
221 ScopedRunnableMethodFactory<RenderWidgetHostViewMac> shutdown_factory_; 217 ScopedRunnableMethodFactory<RenderWidgetHostViewMac> shutdown_factory_;
222 218
223 // Used for positioning a popup menu. 219 // Used for positioning a popup menu.
224 BaseView* parent_view_; 220 BaseView* parent_view_;
225 221
226 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac); 222 DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
227 }; 223 };
228 224
229 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_ 225 #endif // CHROME_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/renderer_host/render_widget_host_view_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698