OLD | NEW |
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/render_widget_host_view_aura.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
6 | 6 |
7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback_helpers.h" | 10 #include "base/callback_helpers.h" |
(...skipping 2351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2362 } | 2362 } |
2363 | 2363 |
2364 scoped_ptr<ResizeLock> RenderWidgetHostViewAura::CreateResizeLock( | 2364 scoped_ptr<ResizeLock> RenderWidgetHostViewAura::CreateResizeLock( |
2365 bool defer_compositor_lock) { | 2365 bool defer_compositor_lock) { |
2366 gfx::Size desired_size = window_->bounds().size(); | 2366 gfx::Size desired_size = window_->bounds().size(); |
2367 return scoped_ptr<ResizeLock>(new CompositorResizeLock( | 2367 return scoped_ptr<ResizeLock>(new CompositorResizeLock( |
2368 window_->GetHost(), | 2368 window_->GetHost(), |
2369 desired_size, | 2369 desired_size, |
2370 defer_compositor_lock, | 2370 defer_compositor_lock, |
2371 base::TimeDelta::FromMilliseconds(kResizeLockTimeoutMs))); | 2371 base::TimeDelta::FromMilliseconds(kResizeLockTimeoutMs))); |
2372 ResizeLock* lock = NULL; | |
2373 return scoped_ptr<ResizeLock>(lock); | |
2374 } | 2372 } |
2375 | 2373 |
2376 DelegatedFrameHost* RenderWidgetHostViewAura::GetDelegatedFrameHost() const { | 2374 DelegatedFrameHost* RenderWidgetHostViewAura::GetDelegatedFrameHost() const { |
2377 return delegated_frame_host_.get(); | 2375 return delegated_frame_host_.get(); |
2378 } | 2376 } |
2379 | 2377 |
2380 //////////////////////////////////////////////////////////////////////////////// | 2378 //////////////////////////////////////////////////////////////////////////////// |
2381 // RenderWidgetHostViewBase, public: | 2379 // RenderWidgetHostViewBase, public: |
2382 | 2380 |
2383 // static | 2381 // static |
2384 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { | 2382 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { |
2385 GetScreenInfoForWindow(results, NULL); | 2383 GetScreenInfoForWindow(results, NULL); |
2386 } | 2384 } |
2387 | 2385 |
2388 } // namespace content | 2386 } // namespace content |
OLD | NEW |