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

Side by Side Diff: components/web_view/test_frame_tree_delegate.cc

Issue 1347023003: Rename frame classes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge 2 trunk Created 5 years, 2 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
« no previous file with comments | « components/web_view/test_frame_tree_delegate.h ('k') | components/web_view/web_view_impl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/web_view/test_frame_tree_delegate.h" 5 #include "components/web_view/test_frame_tree_delegate.h"
6 6
7 #include "base/run_loop.h" 7 #include "base/run_loop.h"
8 #include "components/web_view/client_initiated_frame_connection.h" 8 #include "components/web_view/client_initiated_frame_connection.h"
9 #include "components/web_view/frame_connection.h" 9 #include "components/web_view/frame_connection.h"
10 #include "testing/gtest/include/gtest/gtest.h" 10 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 42
43 void TestFrameTreeDelegate::WaitForFrameDisconnected(Frame* frame) { 43 void TestFrameTreeDelegate::WaitForFrameDisconnected(Frame* frame) {
44 ASSERT_FALSE(is_waiting()); 44 ASSERT_FALSE(is_waiting());
45 waiting_for_frame_disconnected_ = frame; 45 waiting_for_frame_disconnected_ = frame;
46 run_loop_.reset(new base::RunLoop); 46 run_loop_.reset(new base::RunLoop);
47 run_loop_->Run(); 47 run_loop_->Run();
48 run_loop_.reset(); 48 run_loop_.reset();
49 } 49 }
50 50
51 scoped_ptr<FrameUserData> TestFrameTreeDelegate::CreateUserDataForNewFrame( 51 scoped_ptr<FrameUserData> TestFrameTreeDelegate::CreateUserDataForNewFrame(
52 FrameTreeClientPtr frame_tree_client) { 52 mojom::FrameClientPtr frame_client) {
53 return make_scoped_ptr( 53 return make_scoped_ptr(
54 new ClientInitiatedFrameConnection(frame_tree_client.Pass())); 54 new ClientInitiatedFrameConnection(frame_client.Pass()));
55 } 55 }
56 56
57 bool TestFrameTreeDelegate::CanPostMessageEventToFrame( 57 bool TestFrameTreeDelegate::CanPostMessageEventToFrame(
58 const Frame* source, 58 const Frame* source,
59 const Frame* target, 59 const Frame* target,
60 HTMLMessageEvent* event) { 60 mojom::HTMLMessageEvent* event) {
61 return true; 61 return true;
62 } 62 }
63 63
64 void TestFrameTreeDelegate::LoadingStateChanged(bool loading, double progress) { 64 void TestFrameTreeDelegate::LoadingStateChanged(bool loading, double progress) {
65 } 65 }
66 66
67 void TestFrameTreeDelegate::TitleChanged(const mojo::String& title) {} 67 void TestFrameTreeDelegate::TitleChanged(const mojo::String& title) {}
68 68
69 void TestFrameTreeDelegate::NavigateTopLevel(Frame* source, 69 void TestFrameTreeDelegate::NavigateTopLevel(Frame* source,
70 mojo::URLRequestPtr request) {} 70 mojo::URLRequestPtr request) {}
(...skipping 25 matching lines...) Expand all
96 } 96 }
97 97
98 void TestFrameTreeDelegate::OnViewEmbeddedInFrameDisconnected(Frame* frame) { 98 void TestFrameTreeDelegate::OnViewEmbeddedInFrameDisconnected(Frame* frame) {
99 if (waiting_for_frame_disconnected_ == frame) { 99 if (waiting_for_frame_disconnected_ == frame) {
100 waiting_for_frame_disconnected_ = nullptr; 100 waiting_for_frame_disconnected_ = nullptr;
101 run_loop_->Quit(); 101 run_loop_->Quit();
102 } 102 }
103 } 103 }
104 104
105 } // namespace web_view 105 } // namespace web_view
OLDNEW
« no previous file with comments | « components/web_view/test_frame_tree_delegate.h ('k') | components/web_view/web_view_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698