content/browser/tab_contents/tab_contents_observer.h - Issue 6915019: Changes to not use the prerendered contents when window.opener needs to be set.

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

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

« chrome/browser/prerender/prerender_browsertest.cc ('K') | « content/browser/tab_contents/tab_contents.cc ('k') | content/browser/tab_contents/tab_contents_observer.cc » ('j') | content/common/view_messages.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 #ifndef CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_OBSERVER_H_	5 #ifndef CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_OBSERVER_H_

6 #define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_OBSERVER_H_	6 #define CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_OBSERVER_H_

7	7

8 #include "content/browser/tab_contents/navigation_controller.h"	8 #include "content/browser/tab_contents/navigation_controller.h"

9 #include "content/common/page_transition_types.h"	9 #include "content/common/page_transition_types.h"

10 #include "ipc/ipc_channel.h"	10 #include "ipc/ipc_channel.h"

(...skipping 33 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
44 virtual void DidNavigateMainFramePostCommit(	44 virtual void DidNavigateMainFramePostCommit(

45 const NavigationController::LoadCommittedDetails& details,	45 const NavigationController::LoadCommittedDetails& details,

46 const ViewHostMsg_FrameNavigate_Params& params);	46 const ViewHostMsg_FrameNavigate_Params& params);

47 virtual void DidNavigateAnyFramePostCommit(	47 virtual void DidNavigateAnyFramePostCommit(

48 const NavigationController::LoadCommittedDetails& details,	48 const NavigationController::LoadCommittedDetails& details,

49 const ViewHostMsg_FrameNavigate_Params& params);	49 const ViewHostMsg_FrameNavigate_Params& params);

50 virtual void DidStartProvisionalLoadForFrame(int64 frame_id,	50 virtual void DidStartProvisionalLoadForFrame(int64 frame_id,

51 bool is_main_frame,	51 bool is_main_frame,

52 const GURL& validated_url,	52 const GURL& validated_url,

53 bool is_error_page);	53 bool is_error_page);

54 virtual void ProvisionalChangeToMainFrameUrl(const GURL& url);	54 virtual void ProvisionalChangeToMainFrameUrl(const GURL& url,

	55 bool has_opener_set);

55 virtual void DidCommitProvisionalLoadForFrame(	56 virtual void DidCommitProvisionalLoadForFrame(

56 int64 frame_id,	57 int64 frame_id,

57 bool is_main_frame,	58 bool is_main_frame,

58 const GURL& url,	59 const GURL& url,

59 PageTransition::Type transition_type);	60 PageTransition::Type transition_type);

60 virtual void DidFailProvisionalLoad(int64 frame_id,	61 virtual void DidFailProvisionalLoad(int64 frame_id,

61 bool is_main_frame,	62 bool is_main_frame,

62 const GURL& validated_url,	63 const GURL& validated_url,

63 int error_code);	64 int error_code);

64 virtual void DocumentLoadedInFrame(int64 frame_id);	65 virtual void DocumentLoadedInFrame(int64 frame_id);

(...skipping 64 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
129	130

130 TabContents* tab_contents_;	131 TabContents* tab_contents_;

131	132

132 // The routing ID of the associated TabContents.	133 // The routing ID of the associated TabContents.

133 int routing_id_;	134 int routing_id_;

134	135

135 DISALLOW_COPY_AND_ASSIGN(TabContentsObserver);	136 DISALLOW_COPY_AND_ASSIGN(TabContentsObserver);

136 };	137 };

137	138

138 #endif // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_OBSERVER_H_	139 #endif // CONTENT_BROWSER_TAB_CONTENTS_TAB_CONTENTS_OBSERVER_H_

OLD	NEW