content/browser/web_contents/web_contents_impl.h - Issue 182713005: Remove frame ID from DidCommitProvisionalLoad.

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

Issue 182713005: Remove frame ID from DidCommitProvisionalLoad. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix John's comments and signin test Created 6 years, 9 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

« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.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 449 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
460 virtual void DidFailLoadWithError(	460 virtual void DidFailLoadWithError(

461 RenderFrameHostImpl* render_frame_host,	461 RenderFrameHostImpl* render_frame_host,

462 const GURL& url,	462 const GURL& url,

463 bool is_main_frame,	463 bool is_main_frame,

464 int error_code,	464 int error_code,

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

466 virtual void DidRedirectProvisionalLoad(	466 virtual void DidRedirectProvisionalLoad(

467 RenderFrameHostImpl* render_frame_host,	467 RenderFrameHostImpl* render_frame_host,

468 const GURL& validated_target_url) OVERRIDE;	468 const GURL& validated_target_url) OVERRIDE;

469 virtual void DidCommitProvisionalLoad(	469 virtual void DidCommitProvisionalLoad(

470 int64 frame_id,	470 RenderFrameHostImpl* render_frame_host,

471 const base::string16& frame_unique_name,	471 const base::string16& frame_unique_name,

472 bool is_main_frame,	472 bool is_main_frame,

473 const GURL& url,	473 const GURL& url,

474 PageTransition transition_type,	474 PageTransition transition_type) OVERRIDE;

475 RenderFrameHostImpl* render_frame_host) OVERRIDE;

476 virtual void DidNavigateMainFramePostCommit(	475 virtual void DidNavigateMainFramePostCommit(

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

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

479 virtual void DidNavigateAnyFramePostCommit(	478 virtual void DidNavigateAnyFramePostCommit(

480 RenderFrameHostImpl* render_frame_host,	479 RenderFrameHostImpl* render_frame_host,

481 const LoadCommittedDetails& details,	480 const LoadCommittedDetails& details,

482 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) OVERRIDE;	481 const FrameHostMsg_DidCommitProvisionalLoad_Params& params) OVERRIDE;

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

484 virtual bool CanOverscrollContent() OVERRIDE;	483 virtual bool CanOverscrollContent() OVERRIDE;

485 virtual void NotifyChangedNavigationState(	484 virtual void NotifyChangedNavigationState(

(...skipping 575 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1061 // Whether this WebContents is responsible for displaying a subframe in a	1060 // Whether this WebContents is responsible for displaying a subframe in a

1062 // different process from its parent page.	1061 // different process from its parent page.

1063 bool is_subframe_;	1062 bool is_subframe_;

1064	1063

1065 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);	1064 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);

1066 };	1065 };

1067	1066

1068 } // namespace content	1067 } // namespace content

1069	1068

1070 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_	1069 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_

OLD	NEW