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

Side by Side Diff: chrome/browser/instant/instant_unload_handler.cc

Issue 5581010: Merge 68646 - Makes instant run before unload listeners.... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/597/src/
Patch Set: Created 10 years 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
« no previous file with comments | « chrome/browser/instant/instant_unload_handler.h ('k') | chrome/browser/sessions/session_id.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome/browser/instant/instant_unload_handler.h" 5 #include "chrome/browser/instant/instant_unload_handler.h"
6 6
7 #include "chrome/browser/renderer_host/render_view_host.h" 7 #include "chrome/browser/renderer_host/render_view_host.h"
8 #include "chrome/browser/tab_contents/tab_contents.h" 8 #include "chrome/browser/tab_contents/tab_contents.h"
9 #include "chrome/browser/tab_contents/tab_contents_delegate.h" 9 #include "chrome/browser/tab_contents/tab_contents_delegate.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 // Add the tab back in. 126 // Add the tab back in.
127 browser::Navigate(&params); 127 browser::Navigate(&params);
128 } 128 }
129 129
130 void InstantUnloadHandler::Destroy(TabContentsDelegateImpl* delegate) { 130 void InstantUnloadHandler::Destroy(TabContentsDelegateImpl* delegate) {
131 ScopedVector<TabContentsDelegateImpl>::iterator i = 131 ScopedVector<TabContentsDelegateImpl>::iterator i =
132 std::find(delegates_.begin(), delegates_.end(), delegate); 132 std::find(delegates_.begin(), delegates_.end(), delegate);
133 DCHECK(i != delegates_.end()); 133 DCHECK(i != delegates_.end());
134 delegates_.erase(i); 134 delegates_.erase(i);
135 } 135 }
OLDNEW
« no previous file with comments | « chrome/browser/instant/instant_unload_handler.h ('k') | chrome/browser/sessions/session_id.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698