Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(414)

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 12189018: <webview>: Implement WebRequest API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Diff from latest patch Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 } 334 }
335 created_widgets_.clear(); 335 created_widgets_.clear();
336 336
337 // Clear out any JavaScript state. 337 // Clear out any JavaScript state.
338 if (dialog_manager_) 338 if (dialog_manager_)
339 dialog_manager_->ResetJavaScriptState(this); 339 dialog_manager_->ResetJavaScriptState(this);
340 340
341 if (color_chooser_) 341 if (color_chooser_)
342 color_chooser_->End(); 342 color_chooser_->End();
343 343
344 if (browser_plugin_guest_)
345 browser_plugin_guest_->Destroy();
346
344 NotifyDisconnected(); 347 NotifyDisconnected();
345 348
346 // Notify any observer that have a reference on this WebContents. 349 // Notify any observer that have a reference on this WebContents.
347 NotificationService::current()->Notify( 350 NotificationService::current()->Notify(
348 NOTIFICATION_WEB_CONTENTS_DESTROYED, 351 NOTIFICATION_WEB_CONTENTS_DESTROYED,
349 Source<WebContents>(this), 352 Source<WebContents>(this),
350 NotificationService::NoDetails()); 353 NotificationService::NoDetails());
351 354
352 // TODO(brettw) this should be moved to the view. 355 // TODO(brettw) this should be moved to the view.
353 #if defined(OS_WIN) && !defined(USE_AURA) 356 #if defined(OS_WIN) && !defined(USE_AURA)
(...skipping 3152 matching lines...) Expand 10 before | Expand all | Expand 10 after
3506 3509
3507 BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() const { 3510 BrowserPluginGuest* WebContentsImpl::GetBrowserPluginGuest() const {
3508 return browser_plugin_guest_.get(); 3511 return browser_plugin_guest_.get();
3509 } 3512 }
3510 3513
3511 BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() const { 3514 BrowserPluginEmbedder* WebContentsImpl::GetBrowserPluginEmbedder() const {
3512 return browser_plugin_embedder_.get(); 3515 return browser_plugin_embedder_.get();
3513 } 3516 }
3514 3517
3515 } // namespace content 3518 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698