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 2243 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2254 #if defined(OS_ANDROID) | 2254 #if defined(OS_ANDROID) |
2255 void WebContentsImpl::OnFindMatchRectsReply( | 2255 void WebContentsImpl::OnFindMatchRectsReply( |
2256 int version, | 2256 int version, |
2257 const std::vector<gfx::RectF>& rects, | 2257 const std::vector<gfx::RectF>& rects, |
2258 const gfx::RectF& active_rect) { | 2258 const gfx::RectF& active_rect) { |
2259 if (delegate_) | 2259 if (delegate_) |
2260 delegate_->FindMatchRectsReply(this, version, rects, active_rect); | 2260 delegate_->FindMatchRectsReply(this, version, rects, active_rect); |
2261 } | 2261 } |
2262 #endif | 2262 #endif |
2263 | 2263 |
2264 void WebContentsImpl::OnCrashedPlugin(const FilePath& plugin_path) { | 2264 void WebContentsImpl::OnCrashedPlugin(const FilePath& plugin_path, |
| 2265 base::ProcessId plugin_pid) { |
2265 FOR_EACH_OBSERVER(WebContentsObserver, observers_, | 2266 FOR_EACH_OBSERVER(WebContentsObserver, observers_, |
2266 PluginCrashed(plugin_path)); | 2267 PluginCrashed(plugin_path, plugin_pid)); |
2267 } | 2268 } |
2268 | 2269 |
2269 void WebContentsImpl::OnAppCacheAccessed(const GURL& manifest_url, | 2270 void WebContentsImpl::OnAppCacheAccessed(const GURL& manifest_url, |
2270 bool blocked_by_policy) { | 2271 bool blocked_by_policy) { |
2271 // Notify observers about navigation. | 2272 // Notify observers about navigation. |
2272 FOR_EACH_OBSERVER(WebContentsObserver, observers_, | 2273 FOR_EACH_OBSERVER(WebContentsObserver, observers_, |
2273 AppCacheAccessed(manifest_url, blocked_by_policy)); | 2274 AppCacheAccessed(manifest_url, blocked_by_policy)); |
2274 } | 2275 } |
2275 | 2276 |
2276 void WebContentsImpl::OnOpenColorChooser(int color_chooser_id, | 2277 void WebContentsImpl::OnOpenColorChooser(int color_chooser_id, |
(...skipping 1109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3386 | 3387 |
3387 BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() { | 3388 BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() { |
3388 return browser_plugin_guest_.get(); | 3389 return browser_plugin_guest_.get(); |
3389 } | 3390 } |
3390 | 3391 |
3391 BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() { | 3392 BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() { |
3392 return browser_plugin_embedder_.get(); | 3393 return browser_plugin_embedder_.get(); |
3393 } | 3394 } |
3394 | 3395 |
3395 } // namespace content | 3396 } // namespace content |
OLD | NEW |