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

Side by Side Diff: content/test/test_frame_navigation_observer.h

Issue 1148953014: Fix the commit type for out-of-process iframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix failing tests Created 5 years, 7 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 #ifndef CONTENT_TEST_TEST_FRAME_NAVIGATION_OBSERVER_H_ 5 #ifndef CONTENT_TEST_TEST_FRAME_NAVIGATION_OBSERVER_H_
6 #define CONTENT_TEST_TEST_FRAME_NAVIGATION_OBSERVER_H_ 6 #define CONTENT_TEST_TEST_FRAME_NAVIGATION_OBSERVER_H_
7 7
8 #include <set> 8 #include <set>
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 26 matching lines...) Expand all
37 // Runs a nested message loop and blocks until the expected number of 37 // Runs a nested message loop and blocks until the expected number of
38 // navigations are complete. 38 // navigations are complete.
39 void Wait(); 39 void Wait();
40 40
41 private: 41 private:
42 // WebContentsObserver 42 // WebContentsObserver
43 void DidStartProvisionalLoadForFrame(RenderFrameHost* render_frame_host, 43 void DidStartProvisionalLoadForFrame(RenderFrameHost* render_frame_host,
44 const GURL& validated_url, 44 const GURL& validated_url,
45 bool is_error_page, 45 bool is_error_page,
46 bool is_iframe_srcdoc) override; 46 bool is_iframe_srcdoc) override;
47 void DidNavigateAnyFrame(RenderFrameHost* render_frame_host, 47 void DidCommitProvisionalLoadForFrame(
Charlie Reis 2015/05/27 17:26:24 This is https://codereview.chromium.org/1149073004
48 const LoadCommittedDetails& details, 48 RenderFrameHost* render_frame_host,
49 const FrameNavigateParams& params) override; 49 const GURL& url,
50 ui::PageTransition transition_type) override;
50 51
51 // The id of the FrameTreeNode in which navigations are peformed. 52 // The id of the FrameTreeNode in which navigations are peformed.
52 int frame_tree_node_id_; 53 int frame_tree_node_id_;
53 54
54 // If true the navigation has started. 55 // If true the navigation has started.
55 bool navigation_started_; 56 bool navigation_started_;
56 57
57 // The number of navigations that have been completed. 58 // The number of navigations that have been completed.
58 int navigations_completed_; 59 int navigations_completed_;
59 60
60 // The number of navigations to wait for. 61 // The number of navigations to wait for.
61 int number_of_navigations_; 62 int number_of_navigations_;
62 63
63 // The MessageLoopRunner used to spin the message loop. 64 // The MessageLoopRunner used to spin the message loop.
64 scoped_refptr<MessageLoopRunner> message_loop_runner_; 65 scoped_refptr<MessageLoopRunner> message_loop_runner_;
65 66
66 DISALLOW_COPY_AND_ASSIGN(TestFrameNavigationObserver); 67 DISALLOW_COPY_AND_ASSIGN(TestFrameNavigationObserver);
67 }; 68 };
68 69
69 } // namespace content 70 } // namespace content
70 71
71 #endif // CONTENT_TEST_TEST_FRAME_NAVIGATION_OBSERVER_H_ 72 #endif // CONTENT_TEST_TEST_FRAME_NAVIGATION_OBSERVER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698