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 461 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
472 SessionStorageNamespaceMap GetSessionStorageNamespaceMap() override; | 472 SessionStorageNamespaceMap GetSessionStorageNamespaceMap() override; |
473 FrameTree* GetFrameTree() override; | 473 FrameTree* GetFrameTree() override; |
474 | 474 |
475 // NavigatorDelegate --------------------------------------------------------- | 475 // NavigatorDelegate --------------------------------------------------------- |
476 | 476 |
477 void DidStartProvisionalLoad(RenderFrameHostImpl* render_frame_host, | 477 void DidStartProvisionalLoad(RenderFrameHostImpl* render_frame_host, |
478 const GURL& validated_url, | 478 const GURL& validated_url, |
479 bool is_error_page, | 479 bool is_error_page, |
480 bool is_iframe_srcdoc) override; | 480 bool is_iframe_srcdoc) override; |
481 void DidStartNavigationTransition( | 481 void DidStartNavigationTransition( |
482 RenderFrameHostImpl* render_frame_host) override; | 482 RenderFrameHostImpl* render_frame_host, |
| 483 const TransitionLayerData& transition_data) override; |
483 void DidFailProvisionalLoadWithError( | 484 void DidFailProvisionalLoadWithError( |
484 RenderFrameHostImpl* render_frame_host, | 485 RenderFrameHostImpl* render_frame_host, |
485 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) | 486 const FrameHostMsg_DidFailProvisionalLoadWithError_Params& params) |
486 override; | 487 override; |
487 void DidFailLoadWithError(RenderFrameHostImpl* render_frame_host, | 488 void DidFailLoadWithError(RenderFrameHostImpl* render_frame_host, |
488 const GURL& url, | 489 const GURL& url, |
489 int error_code, | 490 int error_code, |
490 const base::string16& error_description) override; | 491 const base::string16& error_description) override; |
491 void DidCommitProvisionalLoad(RenderFrameHostImpl* render_frame_host, | 492 void DidCommitProvisionalLoad(RenderFrameHostImpl* render_frame_host, |
492 const GURL& url, | 493 const GURL& url, |
(...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1213 scoped_ptr<WebContentsAudioMuter> audio_muter_; | 1214 scoped_ptr<WebContentsAudioMuter> audio_muter_; |
1214 | 1215 |
1215 base::WeakPtrFactory<WebContentsImpl> loading_weak_factory_; | 1216 base::WeakPtrFactory<WebContentsImpl> loading_weak_factory_; |
1216 | 1217 |
1217 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); | 1218 DISALLOW_COPY_AND_ASSIGN(WebContentsImpl); |
1218 }; | 1219 }; |
1219 | 1220 |
1220 } // namespace content | 1221 } // namespace content |
1221 | 1222 |
1222 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ | 1223 #endif // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_ |
OLD | NEW |