Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(337)

Side by Side Diff: components/dom_distiller/content/browser/web_contents_main_frame_observer.cc

Issue 2663333004: Convert dom_distiller::WebContentsMainFrameObserver to use the new navigation callbacks. (Closed)
Patch Set: undo testing change Created 3 years, 10 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #include "components/dom_distiller/content/browser/web_contents_main_frame_obser ver.h" 5 #include "components/dom_distiller/content/browser/web_contents_main_frame_obser ver.h"
6 6
7 #include "content/public/browser/navigation_details.h" 7 #include "content/public/browser/navigation_handle.h"
8 #include "content/public/browser/render_frame_host.h" 8 #include "content/public/browser/render_frame_host.h"
9 #include "content/public/browser/web_contents.h" 9 #include "content/public/browser/web_contents.h"
10 #include "content/public/browser/web_contents_observer.h" 10 #include "content/public/browser/web_contents_observer.h"
11 #include "content/public/browser/web_contents_user_data.h" 11 #include "content/public/browser/web_contents_user_data.h"
12 12
13 DEFINE_WEB_CONTENTS_USER_DATA_KEY(dom_distiller::WebContentsMainFrameObserver); 13 DEFINE_WEB_CONTENTS_USER_DATA_KEY(dom_distiller::WebContentsMainFrameObserver);
14 14
15 namespace dom_distiller { 15 namespace dom_distiller {
16 16
17 WebContentsMainFrameObserver::WebContentsMainFrameObserver( 17 WebContentsMainFrameObserver::WebContentsMainFrameObserver(
18 content::WebContents* web_contents) 18 content::WebContents* web_contents)
19 : is_document_loaded_in_main_frame_(false), is_initialized_(false) { 19 : is_document_loaded_in_main_frame_(false), is_initialized_(false) {
20 content::WebContentsObserver::Observe(web_contents); 20 content::WebContentsObserver::Observe(web_contents);
21 } 21 }
22 22
23 WebContentsMainFrameObserver::~WebContentsMainFrameObserver() { 23 WebContentsMainFrameObserver::~WebContentsMainFrameObserver() {
24 CleanUp(); 24 CleanUp();
25 } 25 }
26 26
27 void WebContentsMainFrameObserver::DocumentLoadedInFrame( 27 void WebContentsMainFrameObserver::DocumentLoadedInFrame(
28 content::RenderFrameHost* render_frame_host) { 28 content::RenderFrameHost* render_frame_host) {
29 if (!render_frame_host->GetParent()) { 29 if (!render_frame_host->GetParent()) {
30 is_document_loaded_in_main_frame_ = true; 30 is_document_loaded_in_main_frame_ = true;
31 } 31 }
32 } 32 }
33 33
34 void WebContentsMainFrameObserver::DidNavigateMainFrame( 34 void WebContentsMainFrameObserver::DidFinishNavigation(
35 const content::LoadCommittedDetails& details, 35 content::NavigationHandle* navigation_handle) {
36 const content::FrameNavigateParams& params) { 36 if (!navigation_handle->IsInMainFrame() ||
37 if (details.is_navigation_to_different_page()) { 37 !navigation_handle->HasCommitted() ||
38 is_document_loaded_in_main_frame_ = false; 38 navigation_handle->IsSamePage()) {
39 is_initialized_ = true; 39 return;
40 } 40 }
41
42 is_document_loaded_in_main_frame_ = false;
43 is_initialized_ = true;
41 } 44 }
42 45
43 void WebContentsMainFrameObserver::RenderProcessGone( 46 void WebContentsMainFrameObserver::RenderProcessGone(
44 base::TerminationStatus status) { 47 base::TerminationStatus status) {
45 CleanUp(); 48 CleanUp();
46 } 49 }
47 50
48 void WebContentsMainFrameObserver::CleanUp() { 51 void WebContentsMainFrameObserver::CleanUp() {
49 content::WebContentsObserver::Observe(NULL); 52 content::WebContentsObserver::Observe(NULL);
50 } 53 }
51 54
52 } // namespace dom_distiller 55 } // namespace dom_distiller
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698