| 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/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
| (...skipping 2847 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2858 } | 2858 } |
| 2859 | 2859 |
| 2860 void WebContentsImpl::DidCancelLoading() { | 2860 void WebContentsImpl::DidCancelLoading() { |
| 2861 controller_.DiscardNonCommittedEntries(); | 2861 controller_.DiscardNonCommittedEntries(); |
| 2862 | 2862 |
| 2863 // Update the URL display. | 2863 // Update the URL display. |
| 2864 NotifyNavigationStateChanged(INVALIDATE_TYPE_URL); | 2864 NotifyNavigationStateChanged(INVALIDATE_TYPE_URL); |
| 2865 } | 2865 } |
| 2866 | 2866 |
| 2867 void WebContentsImpl::DidChangeLoadProgress(double progress) { | 2867 void WebContentsImpl::DidChangeLoadProgress(double progress) { |
| 2868 #if defined(OS_ANDROID) |
| 2868 if (delegate_) | 2869 if (delegate_) |
| 2869 delegate_->LoadProgressChanged(this, progress); | 2870 delegate_->LoadProgressChanged(this, progress); |
| 2871 #endif |
| 2870 } | 2872 } |
| 2871 | 2873 |
| 2872 void WebContentsImpl::DidUpdateFrameTree(RenderViewHost* rvh) { | 2874 void WebContentsImpl::DidUpdateFrameTree(RenderViewHost* rvh) { |
| 2873 render_manager_.DidUpdateFrameTree(rvh); | 2875 render_manager_.DidUpdateFrameTree(rvh); |
| 2874 } | 2876 } |
| 2875 | 2877 |
| 2876 void WebContentsImpl::DocumentAvailableInMainFrame( | 2878 void WebContentsImpl::DocumentAvailableInMainFrame( |
| 2877 RenderViewHost* render_view_host) { | 2879 RenderViewHost* render_view_host) { |
| 2878 FOR_EACH_OBSERVER(WebContentsObserver, observers_, | 2880 FOR_EACH_OBSERVER(WebContentsObserver, observers_, |
| 2879 DocumentAvailableInMainFrame()); | 2881 DocumentAvailableInMainFrame()); |
| (...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3383 | 3385 |
| 3384 BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() { | 3386 BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() { |
| 3385 return browser_plugin_guest_.get(); | 3387 return browser_plugin_guest_.get(); |
| 3386 } | 3388 } |
| 3387 | 3389 |
| 3388 BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() { | 3390 BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() { |
| 3389 return browser_plugin_embedder_.get(); | 3391 return browser_plugin_embedder_.get(); |
| 3390 } | 3392 } |
| 3391 | 3393 |
| 3392 } // namespace content | 3394 } // namespace content |
| OLD | NEW |