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

Unified Diff: chrome/browser/instant/instant_unload_handler.cc

Issue 10836031: Remove Instant v1 API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update history, title, favicon Created 8 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/instant/instant_unload_handler.h ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/instant/instant_unload_handler.cc
diff --git a/chrome/browser/instant/instant_unload_handler.cc b/chrome/browser/instant/instant_unload_handler.cc
index d4232087d97e6aeaa92423272574e1ffc25ccdb0..b18c32339374c7911c3fca905da6b591560cce9a 100644
--- a/chrome/browser/instant/instant_unload_handler.cc
+++ b/chrome/browser/instant/instant_unload_handler.cc
@@ -6,7 +6,6 @@
#include <algorithm>
-#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_navigator.h"
#include "chrome/browser/ui/tab_contents/tab_contents.h"
#include "content/public/browser/render_view_host.h"
@@ -99,11 +98,7 @@ void InstantUnloadHandler::Activate(WebContentsDelegateImpl* delegate) {
params.tabstrip_index = delegate->index();
// Remove (and delete) the delegate.
- ScopedVector<WebContentsDelegateImpl>::iterator i =
- std::find(delegates_.begin(), delegates_.end(), delegate);
- DCHECK(i != delegates_.end());
- delegates_.erase(i);
- delegate = NULL;
+ Destroy(delegate);
// Add the tab back in.
chrome::Navigate(&params);
« no previous file with comments | « chrome/browser/instant/instant_unload_handler.h ('k') | chrome/browser/profiles/profile_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698