content/browser/web_contents/web_contents_impl.h - Issue 317703004: Simplify AreURLsInPageNavigation

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

Issue 317703004: Simplify AreURLsInPageNavigation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Kill the renderer if it claims a cross-origin in-page navigation Created 6 years, 6 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

« content/browser/frame_host/navigation_controller_impl.cc ('K') | « content/browser/frame_host/navigator_impl.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_	6 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_

7	7

8 #include <map>	8 #include <map>

9 #include <set>	9 #include <set>

10 #include <string>	10 #include <string>

(...skipping 450 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
461 virtual void DidRedirectProvisionalLoad(	461 virtual void DidRedirectProvisionalLoad(

462 RenderFrameHostImpl* render_frame_host,	462 RenderFrameHostImpl* render_frame_host,

463 const GURL& validated_target_url) OVERRIDE;	463 const GURL& validated_target_url) OVERRIDE;

464 virtual void DidCommitProvisionalLoad(	464 virtual void DidCommitProvisionalLoad(

465 RenderFrameHostImpl* render_frame_host,	465 RenderFrameHostImpl* render_frame_host,

466 const base::string16& frame_unique_name,	466 const base::string16& frame_unique_name,

467 bool is_main_frame,	467 bool is_main_frame,

468 const GURL& url,	468 const GURL& url,

469 PageTransition transition_type) OVERRIDE;	469 PageTransition transition_type) OVERRIDE;

470 virtual void DidNavigateMainFramePreCommit(	470 virtual void DidNavigateMainFramePreCommit(

471 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) OVERRIDE;	471 bool navigation_is_within_page) OVERRIDE;

472 virtual void DidNavigateMainFramePostCommit(	472 virtual void DidNavigateMainFramePostCommit(

473 const LoadCommittedDetails& details,	473 const LoadCommittedDetails& details,

474 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) OVERRIDE;	474 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) OVERRIDE;

475 virtual void DidNavigateAnyFramePostCommit(	475 virtual void DidNavigateAnyFramePostCommit(

476 RenderFrameHostImpl* render_frame_host,	476 RenderFrameHostImpl* render_frame_host,

477 const LoadCommittedDetails& details,	477 const LoadCommittedDetails& details,

478 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) OVERRIDE;	478 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) OVERRIDE;

479 virtual void SetMainFrameMimeType(const std::string& mime_type) OVERRIDE;	479 virtual void SetMainFrameMimeType(const std::string& mime_type) OVERRIDE;

480 virtual bool CanOverscrollContent() const OVERRIDE;	480 virtual bool CanOverscrollContent() const OVERRIDE;

481 virtual void NotifyChangedNavigationState(	481 virtual void NotifyChangedNavigationState(

(...skipping 644 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1126 bool last_dialog_suppressed_;	1126 bool last_dialog_suppressed_;

1127	1127

1128 scoped_ptr<GeolocationDispatcherHost> geolocation_dispatcher_host_;	1128 scoped_ptr<GeolocationDispatcherHost> geolocation_dispatcher_host_;

1129	1129

1130 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);	1130 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);

1131 };	1131 };

1132	1132

1133 } // namespace content	1133 } // namespace content

1134	1134

1135 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_	1135 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_

OLD	NEW