OLD | NEW |
1 | 1 |
2 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 2 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
3 // Use of this source code is governed by a BSD-style license that can be | 3 // Use of this source code is governed by a BSD-style license that can be |
4 // found in the LICENSE file. | 4 // found in the LICENSE file. |
5 | 5 |
6 #include "content/browser/browser_url_handler.h" | 6 #include "content/browser/browser_url_handler.h" |
7 #include "content/browser/renderer_host/test_backing_store.h" | 7 #include "content/browser/renderer_host/test_backing_store.h" |
8 #include "content/browser/renderer_host/test_render_view_host.h" | 8 #include "content/browser/renderer_host/test_render_view_host.h" |
9 #include "content/browser/site_instance.h" | 9 #include "content/browser/site_instance.h" |
10 #include "content/browser/tab_contents/navigation_controller.h" | 10 #include "content/browser/tab_contents/navigation_controller.h" |
(...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
227 } | 227 } |
228 | 228 |
229 void TestRenderWidgetHostView::AcceleratedSurfaceBuffersSwapped( | 229 void TestRenderWidgetHostView::AcceleratedSurfaceBuffersSwapped( |
230 gfx::PluginWindowHandle window, | 230 gfx::PluginWindowHandle window, |
231 uint64 surface_id, | 231 uint64 surface_id, |
232 int renderer_id, | 232 int renderer_id, |
233 int32 route_id, | 233 int32 route_id, |
234 int gpu_host_id) { | 234 int gpu_host_id) { |
235 } | 235 } |
236 | 236 |
237 #elif defined(OS_WIN) | 237 #elif defined(OS_WIN) && !defined(USE_AURA) |
238 void TestRenderWidgetHostView::WillWmDestroy() { | 238 void TestRenderWidgetHostView::WillWmDestroy() { |
239 } | 239 } |
240 | 240 |
241 #endif | 241 #endif |
242 | 242 |
243 #if defined(OS_POSIX) || defined(USE_AURA) | 243 #if defined(OS_POSIX) || defined(USE_AURA) |
244 gfx::Rect TestRenderWidgetHostView::GetRootWindowBounds() { | 244 gfx::Rect TestRenderWidgetHostView::GetRootWindowBounds() { |
245 return gfx::Rect(); | 245 return gfx::Rect(); |
246 } | 246 } |
247 #endif | 247 #endif |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
361 SetContents(NULL); | 361 SetContents(NULL); |
362 | 362 |
363 // Make sure that we flush any messages related to TabContents destruction | 363 // Make sure that we flush any messages related to TabContents destruction |
364 // before we destroy the browser context. | 364 // before we destroy the browser context. |
365 MessageLoop::current()->RunAllPending(); | 365 MessageLoop::current()->RunAllPending(); |
366 | 366 |
367 // Release the browser context on the UI thread. | 367 // Release the browser context on the UI thread. |
368 message_loop_.DeleteSoon(FROM_HERE, browser_context_.release()); | 368 message_loop_.DeleteSoon(FROM_HERE, browser_context_.release()); |
369 message_loop_.RunAllPending(); | 369 message_loop_.RunAllPending(); |
370 } | 370 } |
OLD | NEW |