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 463 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
474 SessionStorageNamespaceMap GetSessionStorageNamespaceMap() override; | 474 SessionStorageNamespaceMap GetSessionStorageNamespaceMap() override; |
475 FrameTree* GetFrameTree() override; | 475 FrameTree* GetFrameTree() override; |
476 | 476 |
477 // NavigatorDelegate --------------------------------------------------------- | 477 // NavigatorDelegate --------------------------------------------------------- |
478 | 478 |
479 void DidStartProvisionalLoad(RenderFrameHostImpl* render_frame_host, | 479 void DidStartProvisionalLoad(RenderFrameHostImpl* render_frame_host, |
480 const GURL& validated_url, | 480 const GURL& validated_url, |
481 bool is_error_page, | 481 bool is_error_page, |
482 bool is_iframe_srcdoc) override; | 482 bool is_iframe_srcdoc) override; |
483 void DidStartNavigationTransition( | 483 void DidStartNavigationTransition( |
484 RenderFrameHostImpl* render_frame_host) override; | 484 RenderFrameHostImpl* render_frame_host, |
| 485 const TransitionLayerData& transition_data) override; |
485 void DidFailProvisionalLoadWithError( | 486 void DidFailProvisionalLoadWithError( |
486 RenderFrameHostImpl* render_frame_host, | 487 RenderFrameHostImpl* render_frame_host, |
487 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) | 488 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) |
488 override; | 489 override; |
489 void DidFailLoadWithError(RenderFrameHostImpl* render_frame_host, | 490 void DidFailLoadWithError(RenderFrameHostImpl* render_frame_host, |
490 const GURL& url, | 491 const GURL& url, |
491 int error_code, | 492 int error_code, |
492 const base::string16& error_description) override; | 493 const base::string16& error_description) override; |
493 void DidCommitProvisionalLoad(RenderFrameHostImpl* render_frame_host, | 494 void DidCommitProvisionalLoad(RenderFrameHostImpl* render_frame_host, |
494 const GURL& url, | 495 const GURL& url, |
(...skipping 727 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1222 scoped_ptr<WebContentsAudioMuter> audio_muter_; | 1223 scoped_ptr<WebContentsAudioMuter> audio_muter_; |
1223 | 1224 |
1224 base::WeakPtrFactory<WebContentsImpl> loading_weak_factory_; | 1225 base::WeakPtrFactory<WebContentsImpl> loading_weak_factory_; |
1225 | 1226 |
1226 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); | 1227 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); |
1227 }; | 1228 }; |
1228 | 1229 |
1229 } // namespace content | 1230 } // namespace content |
1230 | 1231 |
1231 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ | 1232 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ |
OLD | NEW |