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

Side by Side Diff: content/browser/renderer_host/test_render_view_host.cc

Issue 10823274: Fix two harmless int-to-pointer conversions that a new clang warns about. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | skia/ext/skia_utils_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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "content/browser/renderer_host/test_backing_store.h" 5 #include "content/browser/renderer_host/test_backing_store.h"
6 #include "content/browser/renderer_host/test_render_view_host.h" 6 #include "content/browser/renderer_host/test_render_view_host.h"
7 #include "content/browser/site_instance_impl.h" 7 #include "content/browser/site_instance_impl.h"
8 #include "content/browser/web_contents/navigation_controller_impl.h" 8 #include "content/browser/web_contents/navigation_controller_impl.h"
9 #include "content/browser/web_contents/test_web_contents.h" 9 #include "content/browser/web_contents/test_web_contents.h"
10 #include "content/common/view_messages.h" 10 #include "content/common/view_messages.h"
(...skipping 217 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 SiteInstance* instance, 228 SiteInstance* instance,
229 RenderViewHostDelegate* delegate, 229 RenderViewHostDelegate* delegate,
230 RenderWidgetHostDelegate* widget_delegate, 230 RenderWidgetHostDelegate* widget_delegate,
231 int routing_id, 231 int routing_id,
232 bool swapped_out) 232 bool swapped_out)
233 : RenderViewHostImpl(instance, 233 : RenderViewHostImpl(instance,
234 delegate, 234 delegate,
235 widget_delegate, 235 widget_delegate,
236 routing_id, 236 routing_id,
237 swapped_out, 237 swapped_out,
238 dom_storage::kInvalidSessionStorageNamespaceId), 238 NULL),
239 render_view_created_(false), 239 render_view_created_(false),
240 delete_counter_(NULL), 240 delete_counter_(NULL),
241 simulate_fetch_via_proxy_(false), 241 simulate_fetch_via_proxy_(false),
242 contents_mime_type_("text/html") { 242 contents_mime_type_("text/html") {
243 // For normal RenderViewHosts, this is freed when |Shutdown()| is 243 // For normal RenderViewHosts, this is freed when |Shutdown()| is
244 // called. For TestRenderViewHost, the view is explicitly 244 // called. For TestRenderViewHost, the view is explicitly
245 // deleted in the destructor below, because 245 // deleted in the destructor below, because
246 // TestRenderWidgetHostView::Destroy() doesn't |delete this|. 246 // TestRenderWidgetHostView::Destroy() doesn't |delete this|.
247 SetView(new TestRenderWidgetHostView(this)); 247 SetView(new TestRenderWidgetHostView(this));
248 } 248 }
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
364 364
365 TestRenderViewHost* RenderViewHostImplTestHarness::active_test_rvh() { 365 TestRenderViewHost* RenderViewHostImplTestHarness::active_test_rvh() {
366 return static_cast<TestRenderViewHost*>(active_rvh()); 366 return static_cast<TestRenderViewHost*>(active_rvh());
367 } 367 }
368 368
369 TestWebContents* RenderViewHostImplTestHarness::contents() { 369 TestWebContents* RenderViewHostImplTestHarness::contents() {
370 return static_cast<TestWebContents*>(web_contents()); 370 return static_cast<TestWebContents*>(web_contents());
371 } 371 }
372 372
373 } // namespace content 373 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | skia/ext/skia_utils_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698