| 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/logging.h" | 10 #include "base/logging.h" |
| (...skipping 3018 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3029 #endif | 3029 #endif |
| 3030 | 3030 |
| 3031 // Ignore this if it comes from a RenderViewHost that we aren't showing. | 3031 // Ignore this if it comes from a RenderViewHost that we aren't showing. |
| 3032 if (delegate_ && rvh == GetRenderViewHost()) | 3032 if (delegate_ && rvh == GetRenderViewHost()) |
| 3033 delegate_->CloseContents(this); | 3033 delegate_->CloseContents(this); |
| 3034 } | 3034 } |
| 3035 | 3035 |
| 3036 void WebContentsImpl::SwappedOut(RenderViewHost* rvh) { | 3036 void WebContentsImpl::SwappedOut(RenderViewHost* rvh) { |
| 3037 if (delegate_ && rvh == GetRenderViewHost()) | 3037 if (delegate_ && rvh == GetRenderViewHost()) |
| 3038 delegate_->SwappedOut(this); | 3038 delegate_->SwappedOut(this); |
| 3039 |
| 3040 // Allow the navigation to proceed. |
| 3041 render_manager_.SwappedOut(rvh); |
| 3039 } | 3042 } |
| 3040 | 3043 |
| 3041 void WebContentsImpl::RequestMove(const gfx::Rect& new_bounds) { | 3044 void WebContentsImpl::RequestMove(const gfx::Rect& new_bounds) { |
| 3042 if (delegate_ && delegate_->IsPopupOrPanel(this)) | 3045 if (delegate_ && delegate_->IsPopupOrPanel(this)) |
| 3043 delegate_->MoveContents(this, new_bounds); | 3046 delegate_->MoveContents(this, new_bounds); |
| 3044 } | 3047 } |
| 3045 | 3048 |
| 3046 void WebContentsImpl::DidStartLoading(RenderViewHost* render_view_host) { | 3049 void WebContentsImpl::DidStartLoading(RenderViewHost* render_view_host) { |
| 3047 SetIsLoading(true, NULL); | 3050 SetIsLoading(true, NULL); |
| 3048 | 3051 |
| (...skipping 579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3628 } | 3631 } |
| 3629 | 3632 |
| 3630 BrowserPluginGuestManager* | 3633 BrowserPluginGuestManager* |
| 3631 WebContentsImpl::GetBrowserPluginGuestManager() const { | 3634 WebContentsImpl::GetBrowserPluginGuestManager() const { |
| 3632 return static_cast<BrowserPluginGuestManager*>( | 3635 return static_cast<BrowserPluginGuestManager*>( |
| 3633 GetBrowserContext()->GetUserData( | 3636 GetBrowserContext()->GetUserData( |
| 3634 browser_plugin::kBrowserPluginGuestManagerKeyName)); | 3637 browser_plugin::kBrowserPluginGuestManagerKeyName)); |
| 3635 } | 3638 } |
| 3636 | 3639 |
| 3637 } // namespace content | 3640 } // namespace content |
| OLD | NEW |