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 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
330 } | 330 } |
331 created_widgets_.clear(); | 331 created_widgets_.clear(); |
332 | 332 |
333 // Clear out any JavaScript state. | 333 // Clear out any JavaScript state. |
334 if (dialog_manager_) | 334 if (dialog_manager_) |
335 dialog_manager_->ResetJavaScriptState(this); | 335 dialog_manager_->ResetJavaScriptState(this); |
336 | 336 |
337 if (color_chooser_) | 337 if (color_chooser_) |
338 color_chooser_->End(); | 338 color_chooser_->End(); |
339 | 339 |
340 if (browser_plugin_guest_) | |
341 browser_plugin_guest_->Destroy(); | |
Charlie Reis
2013/05/17 21:13:00
Is this something new that we didn't need before,
| |
342 | |
340 NotifyDisconnected(); | 343 NotifyDisconnected(); |
341 | 344 |
342 // Notify any observer that have a reference on this WebContents. | 345 // Notify any observer that have a reference on this WebContents. |
343 NotificationService::current()->Notify( | 346 NotificationService::current()->Notify( |
344 NOTIFICATION_WEB_CONTENTS_DESTROYED, | 347 NOTIFICATION_WEB_CONTENTS_DESTROYED, |
345 Source<WebContents>(this), | 348 Source<WebContents>(this), |
346 NotificationService::NoDetails()); | 349 NotificationService::NoDetails()); |
347 | 350 |
348 // TODO(brettw) this should be moved to the view. | 351 // TODO(brettw) this should be moved to the view. |
349 #if defined(OS_WIN) && !defined(USE_AURA) | 352 #if defined(OS_WIN) && !defined(USE_AURA) |
(...skipping 3173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3523 } | 3526 } |
3524 | 3527 |
3525 BrowserPluginGuestManager* | 3528 BrowserPluginGuestManager* |
3526 WebContentsImpl::GetBrowserPluginGuestManager() const { | 3529 WebContentsImpl::GetBrowserPluginGuestManager() const { |
3527 return static_cast<BrowserPluginGuestManager*>( | 3530 return static_cast<BrowserPluginGuestManager*>( |
3528 GetBrowserContext()->GetUserData( | 3531 GetBrowserContext()->GetUserData( |
3529 browser_plugin::kBrowserPluginGuestManagerKeyName)); | 3532 browser_plugin::kBrowserPluginGuestManagerKeyName)); |
3530 } | 3533 } |
3531 | 3534 |
3532 } // namespace content | 3535 } // namespace content |
OLD | NEW |