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 357 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
368 | 368 |
369 registrar_.Add(this, | 369 registrar_.Add(this, |
370 content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED, | 370 content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED, |
371 content::NotificationService::AllBrowserContextsAndSources()); | 371 content::NotificationService::AllBrowserContextsAndSources()); |
372 | 372 |
373 #if defined(ENABLE_JAVA_BRIDGE) | 373 #if defined(ENABLE_JAVA_BRIDGE) |
374 java_bridge_dispatcher_host_manager_.reset( | 374 java_bridge_dispatcher_host_manager_.reset( |
375 new JavaBridgeDispatcherHostManager(this)); | 375 new JavaBridgeDispatcherHostManager(this)); |
376 #endif | 376 #endif |
377 | 377 |
378 browser_plugin_host_.reset(new content::BrowserPluginHost(this)); | 378 browser_plugin_host_.reset(new content::old::BrowserPluginHost(this)); |
379 } | 379 } |
380 | 380 |
381 WebContentsImpl::~WebContentsImpl() { | 381 WebContentsImpl::~WebContentsImpl() { |
382 is_being_destroyed_ = true; | 382 is_being_destroyed_ = true; |
383 | 383 |
384 // Clear out any JavaScript state. | 384 // Clear out any JavaScript state. |
385 if (dialog_creator_) | 385 if (dialog_creator_) |
386 dialog_creator_->ResetJavaScriptState(this); | 386 dialog_creator_->ResetJavaScriptState(this); |
387 | 387 |
388 if (color_chooser_) | 388 if (color_chooser_) |
(...skipping 2765 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3154 browser_plugin_host()->embedder_render_process_host(); | 3154 browser_plugin_host()->embedder_render_process_host(); |
3155 *embedder_container_id = browser_plugin_host()->instance_id(); | 3155 *embedder_container_id = browser_plugin_host()->instance_id(); |
3156 int embedder_process_id = | 3156 int embedder_process_id = |
3157 embedder_render_process_host ? embedder_render_process_host->GetID() : -1; | 3157 embedder_render_process_host ? embedder_render_process_host->GetID() : -1; |
3158 if (embedder_process_id != -1) { | 3158 if (embedder_process_id != -1) { |
3159 *embedder_channel_name = | 3159 *embedder_channel_name = |
3160 StringPrintf("%d.r%d", render_view_host->GetProcess()->GetID(), | 3160 StringPrintf("%d.r%d", render_view_host->GetProcess()->GetID(), |
3161 embedder_process_id); | 3161 embedder_process_id); |
3162 } | 3162 } |
3163 } | 3163 } |
OLD | NEW |