| 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/web_contents/web_contents_impl.h" | 5 #include "content/browser/web_contents/web_contents_impl.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
| (...skipping 4367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4378 gfx::Size size; | 4378 gfx::Size size; |
| 4379 if (delegate_) | 4379 if (delegate_) |
| 4380 size = delegate_->GetSizeForNewRenderView(this); | 4380 size = delegate_->GetSizeForNewRenderView(this); |
| 4381 if (size.IsEmpty()) | 4381 if (size.IsEmpty()) |
| 4382 size = GetContainerBounds().size(); | 4382 size = GetContainerBounds().size(); |
| 4383 return size; | 4383 return size; |
| 4384 } | 4384 } |
| 4385 | 4385 |
| 4386 void WebContentsImpl::OnFrameRemoved(RenderFrameHost* render_frame_host) { | 4386 void WebContentsImpl::OnFrameRemoved(RenderFrameHost* render_frame_host) { |
| 4387 FOR_EACH_OBSERVER( | 4387 FOR_EACH_OBSERVER( |
| 4388 WebContentsObserver, observers_, FrameDetached(render_frame_host)); | 4388 WebContentsObserver, observers_, FrameDeleted(render_frame_host)); |
| 4389 } | 4389 } |
| 4390 | 4390 |
| 4391 void WebContentsImpl::OnPreferredSizeChanged(const gfx::Size& old_size) { | 4391 void WebContentsImpl::OnPreferredSizeChanged(const gfx::Size& old_size) { |
| 4392 if (!delegate_) | 4392 if (!delegate_) |
| 4393 return; | 4393 return; |
| 4394 const gfx::Size new_size = GetPreferredSize(); | 4394 const gfx::Size new_size = GetPreferredSize(); |
| 4395 if (new_size != old_size) | 4395 if (new_size != old_size) |
| 4396 delegate_->UpdatePreferredSize(this, new_size); | 4396 delegate_->UpdatePreferredSize(this, new_size); |
| 4397 } | 4397 } |
| 4398 | 4398 |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4440 node->render_manager()->ResumeResponseDeferredAtStart(); | 4440 node->render_manager()->ResumeResponseDeferredAtStart(); |
| 4441 } | 4441 } |
| 4442 | 4442 |
| 4443 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { | 4443 void WebContentsImpl::SetForceDisableOverscrollContent(bool force_disable) { |
| 4444 force_disable_overscroll_content_ = force_disable; | 4444 force_disable_overscroll_content_ = force_disable; |
| 4445 if (view_) | 4445 if (view_) |
| 4446 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); | 4446 view_->SetOverscrollControllerEnabled(CanOverscrollContent()); |
| 4447 } | 4447 } |
| 4448 | 4448 |
| 4449 } // namespace content | 4449 } // namespace content |
| OLD | NEW |