components/view_manager/view_manager_client_apptest.cc - Issue 1085233004: Moves services implementations out of third_party/mojo_services

Side by Side Diff: components/view_manager/view_manager_client_apptest.cc

Issue 1085233004: Moves services implementations out of third_party/mojo_services (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: unnecessary changes Created 5 years, 8 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

« components/view_manager/public/cpp/lib/view_private.h ('K') | « components/view_manager/view_manager_app.h ('k') | components/view_manager/view_manager_service_apptest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 "third_party/mojo_services/src/view_manager/public/cpp/view_manager.h"	5 #include "components/view_manager/public/cpp/view_manager.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/memory/scoped_vector.h"	10 #include "base/memory/scoped_vector.h"

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

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

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

	14 #include "components/view_manager/public/cpp/lib/view_manager_client_impl.h"

	15 #include "components/view_manager/public/cpp/view_manager_client_factory.h"

	16 #include "components/view_manager/public/cpp/view_manager_context.h"

	17 #include "components/view_manager/public/cpp/view_manager_delegate.h"

	18 #include "components/view_manager/public/cpp/view_observer.h"

14 #include "mojo/application/application_test_base_chromium.h"	19 #include "mojo/application/application_test_base_chromium.h"

15 #include "third_party/mojo/src/mojo/public/cpp/application/application_connectio n.h"	20 #include "third_party/mojo/src/mojo/public/cpp/application/application_connectio n.h"

16 #include "third_party/mojo/src/mojo/public/cpp/application/application_delegate. h"	21 #include "third_party/mojo/src/mojo/public/cpp/application/application_delegate. h"

17 #include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"	22 #include "third_party/mojo/src/mojo/public/cpp/application/application_impl.h"

18 #include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl .h"	23 #include "third_party/mojo/src/mojo/public/cpp/application/service_provider_impl .h"

19 #include "third_party/mojo_services/src/geometry/public/cpp/geometry_util.h"	24 #include "ui/mojo/geometry/geometry_util.h"

20 #include "third_party/mojo_services/src/view_manager/public/cpp/lib/view_manager _client_impl.h"

21 #include "third_party/mojo_services/src/view_manager/public/cpp/view_manager_cli ent_factory.h"

22 #include "third_party/mojo_services/src/view_manager/public/cpp/view_manager_con text.h"

23 #include "third_party/mojo_services/src/view_manager/public/cpp/view_manager_del egate.h"

24 #include "third_party/mojo_services/src/view_manager/public/cpp/view_observer.h"

25	25

26 namespace mojo {	26 namespace mojo {

27	27

28 namespace {	28 namespace {

29	29

30 base::RunLoop* current_run_loop = nullptr;	30 base::RunLoop* current_run_loop = nullptr;

31	31

32 void TimeoutRunLoop(const base::Closure& timeout_task, bool* timeout) {	32 void TimeoutRunLoop(const base::Closure& timeout_task, bool* timeout) {

33 CHECK(current_run_loop);	33 CHECK(current_run_loop);

34 *timeout = true;	34 *timeout = true;

(...skipping 569 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
604 view11->SetFocus();	604 view11->SetFocus();

605 ASSERT_TRUE(DoRunLoopWithTimeout());	605 ASSERT_TRUE(DoRunLoopWithTimeout());

606 ASSERT_NE(nullptr, observer.last_gained_focus());	606 ASSERT_NE(nullptr, observer.last_gained_focus());

607 ASSERT_NE(nullptr, observer.last_lost_focus());	607 ASSERT_NE(nullptr, observer.last_lost_focus());

608 EXPECT_EQ(view11->id(), observer.last_gained_focus()->id());	608 EXPECT_EQ(view11->id(), observer.last_gained_focus()->id());

609 EXPECT_EQ(embedded->GetRoot()->id(), observer.last_lost_focus()->id());	609 EXPECT_EQ(embedded->GetRoot()->id(), observer.last_lost_focus()->id());

610 }	610 }

611 }	611 }

612	612

613 } // namespace mojo	613 } // namespace mojo

OLD	NEW