components/web_view/frame_apptest.cc - Issue 1344573002: Mandoline: Rename components/view_manager to components/mus

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

Issue 1344573002: Mandoline: Rename components/view_manager to components/mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased Created 5 years, 3 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/frame.cc ('k') | components/web_view/frame_connection.h » ('j') | no next file with comments »

OLD	NEW
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/frame.h"	5 #include "components/web_view/frame.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/location.h"	8 #include "base/location.h"

9 #include "base/logging.h"	9 #include "base/logging.h"

10 #include "base/message_loop/message_loop.h"	10 #include "base/message_loop/message_loop.h"

11 #include "base/run_loop.h"	11 #include "base/run_loop.h"

12 #include "base/test/test_timeouts.h"	12 #include "base/test/test_timeouts.h"

13 #include "components/view_manager/public/cpp/view_observer.h"	13 #include "components/mus/public/cpp/view_observer.h"

14 #include "components/view_manager/public/cpp/view_tree_connection.h"	14 #include "components/mus/public/cpp/view_tree_connection.h"

15 #include "components/view_manager/public/cpp/view_tree_delegate.h"	15 #include "components/mus/public/cpp/view_tree_delegate.h"

16 #include "components/view_manager/public/cpp/view_tree_host_factory.h"	16 #include "components/mus/public/cpp/view_tree_host_factory.h"

17 #include "components/web_view/frame.h"	17 #include "components/web_view/frame.h"

18 #include "components/web_view/frame_connection.h"	18 #include "components/web_view/frame_connection.h"

19 #include "components/web_view/frame_tree.h"	19 #include "components/web_view/frame_tree.h"

20 #include "components/web_view/frame_tree_delegate.h"	20 #include "components/web_view/frame_tree_delegate.h"

21 #include "components/web_view/frame_user_data.h"	21 #include "components/web_view/frame_user_data.h"

22 #include "components/web_view/test_frame_tree_delegate.h"	22 #include "components/web_view/test_frame_tree_delegate.h"

23 #include "mojo/application/public/cpp/application_connection.h"	23 #include "mojo/application/public/cpp/application_connection.h"

24 #include "mojo/application/public/cpp/application_delegate.h"	24 #include "mojo/application/public/cpp/application_delegate.h"

25 #include "mojo/application/public/cpp/application_impl.h"	25 #include "mojo/application/public/cpp/application_impl.h"

26 #include "mojo/application/public/cpp/application_test_base.h"	26 #include "mojo/application/public/cpp/application_test_base.h"

(...skipping 370 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
397	397

398 // Send LoadingStarted() from the root targetting a frame from another	398 // Send LoadingStarted() from the root targetting a frame from another

399 // connection. It should be ignored (not update the loading status).	399 // connection. It should be ignored (not update the loading status).

400 root_view_and_frame()->frame_tree_server()->LoadingStarted(	400 root_view_and_frame()->frame_tree_server()->LoadingStarted(

401 shared_frame->id());	401 shared_frame->id());

402 frame_tree_server_binding(frame_tree()->root())->WaitForIncomingMethodCall();	402 frame_tree_server_binding(frame_tree()->root())->WaitForIncomingMethodCall();

403 EXPECT_FALSE(frame_tree()->root()->IsLoading());	403 EXPECT_FALSE(frame_tree()->root()->IsLoading());

404 }	404 }

405	405

406 } // namespace web_view	406 } // namespace web_view

OLD	NEW