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

Side by Side Diff: content/browser/tab_contents/tab_contents_observer.cc

Issue 6915019: Changes to not use the prerendered contents when window.opener needs to be set. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Addressing Sreeram's comments. Created 9 years, 7 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/tab_contents/tab_contents_observer.h" 5 #include "content/browser/tab_contents/tab_contents_observer.h"
6 6
7 #include "content/browser/renderer_host/render_view_host.h" 7 #include "content/browser/renderer_host/render_view_host.h"
8 #include "content/browser/tab_contents/tab_contents.h" 8 #include "content/browser/tab_contents/tab_contents.h"
9 9
10 TabContentsObserver::Registrar::Registrar(TabContentsObserver* observer) 10 TabContentsObserver::Registrar::Registrar(TabContentsObserver* observer)
(...skipping 29 matching lines...) Expand all
40 const ViewHostMsg_FrameNavigate_Params& params) { 40 const ViewHostMsg_FrameNavigate_Params& params) {
41 } 41 }
42 42
43 void TabContentsObserver::DidStartProvisionalLoadForFrame( 43 void TabContentsObserver::DidStartProvisionalLoadForFrame(
44 int64 frame_id, 44 int64 frame_id,
45 bool is_main_frame, 45 bool is_main_frame,
46 const GURL& validated_url, 46 const GURL& validated_url,
47 bool is_error_page) { 47 bool is_error_page) {
48 } 48 }
49 49
50 void TabContentsObserver::ProvisionalChangeToMainFrameUrl(const GURL& url) { 50 void TabContentsObserver::ProvisionalChangeToMainFrameUrl(
51 const GURL& url,
52 bool has_opener_set) {
51 } 53 }
52 54
53 void TabContentsObserver::DidCommitProvisionalLoadForFrame( 55 void TabContentsObserver::DidCommitProvisionalLoadForFrame(
54 int64 frame_id, 56 int64 frame_id,
55 bool is_main_frame, 57 bool is_main_frame,
56 const GURL& url, 58 const GURL& url,
57 PageTransition::Type transition_type) { 59 PageTransition::Type transition_type) {
58 } 60 }
59 61
60 void TabContentsObserver::DidFailProvisionalLoad(int64 frame_id, 62 void TabContentsObserver::DidFailProvisionalLoad(int64 frame_id,
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 } 133 }
132 134
133 void TabContentsObserver::TabContentsDestroyed() { 135 void TabContentsObserver::TabContentsDestroyed() {
134 // Do cleanup so that 'this' can safely be deleted from 136 // Do cleanup so that 'this' can safely be deleted from
135 // TabContentsDestroyed. 137 // TabContentsDestroyed.
136 tab_contents_->RemoveObserver(this); 138 tab_contents_->RemoveObserver(this);
137 TabContents* tab = tab_contents_; 139 TabContents* tab = tab_contents_;
138 tab_contents_ = NULL; 140 tab_contents_ = NULL;
139 TabContentsDestroyed(tab); 141 TabContentsDestroyed(tab);
140 } 142 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698