content/browser/web_contents/web_contents_impl.h - Issue 580133002: Update entry page type to include error pages when appropriate.

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

Issue 580133002: Update entry page type to include error pages when appropriate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix content_browsertests compilation. Created 6 years, 2 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

« no previous file with comments | « content/browser/site_per_process_browsertest.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | content/browser/web_contents/web_contents_impl.cc » ('J')
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 490 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
501 RenderFrameHostImpl* render_frame_host,	501 RenderFrameHostImpl* render_frame_host,

502 const GURL& url,	502 const GURL& url,

503 int error_code,	503 int error_code,

504 const base::string16& error_description) OVERRIDE;	504 const base::string16& error_description) OVERRIDE;

505 virtual void DidRedirectProvisionalLoad(	505 virtual void DidRedirectProvisionalLoad(

506 RenderFrameHostImpl* render_frame_host,	506 RenderFrameHostImpl* render_frame_host,

507 const GURL& validated_target_url) OVERRIDE;	507 const GURL& validated_target_url) OVERRIDE;

508 virtual void DidCommitProvisionalLoad(	508 virtual void DidCommitProvisionalLoad(

509 RenderFrameHostImpl* render_frame_host,	509 RenderFrameHostImpl* render_frame_host,

510 const GURL& url,	510 const GURL& url,

	511 bool url_is_unreachable,

511 ui::PageTransition transition_type) OVERRIDE;	512 ui::PageTransition transition_type) OVERRIDE;

512 virtual void DidNavigateMainFramePreCommit(	513 virtual void DidNavigateMainFramePreCommit(

513 bool navigation_is_within_page) OVERRIDE;	514 bool navigation_is_within_page) OVERRIDE;

514 virtual void DidNavigateMainFramePostCommit(	515 virtual void DidNavigateMainFramePostCommit(

515 const LoadCommittedDetails& details,	516 const LoadCommittedDetails& details,

516 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) OVERRIDE;	517 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) OVERRIDE;

517 virtual void DidNavigateAnyFramePostCommit(	518 virtual void DidNavigateAnyFramePostCommit(

518 RenderFrameHostImpl* render_frame_host,	519 RenderFrameHostImpl* render_frame_host,

519 const LoadCommittedDetails& details,	520 const LoadCommittedDetails& details,

520 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) OVERRIDE;	521 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) OVERRIDE;

(...skipping 721 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1242 AudioStreamMonitor audio_stream_monitor_;	1243 AudioStreamMonitor audio_stream_monitor_;

1243	1244

1244 base::WeakPtrFactory<WebContentsImpl> loading_weak_factory_;	1245 base::WeakPtrFactory<WebContentsImpl> loading_weak_factory_;

1245	1246

1246 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);	1247 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);

1247 };	1248 };

1248	1249

1249 } // namespace content	1250 } // namespace content

1250	1251

1251 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_	1252 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_

OLD	NEW