| 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 "components/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" |   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" |   15 #include "components/view_manager/public/cpp/view_manager_client_factory.h" | 
|   16 #include "components/view_manager/public/cpp/view_manager_delegate.h" |   16 #include "components/view_manager/public/cpp/view_manager_delegate.h" | 
|   17 #include "components/view_manager/public/cpp/view_manager_init.h" |   17 #include "components/view_manager/public/cpp/view_manager_init.h" | 
|   18 #include "components/view_manager/public/cpp/view_observer.h" |   18 #include "components/view_manager/public/cpp/view_observer.h" | 
|   19 #include "mojo/application/application_test_base_chromium.h" |  | 
|   20 #include "mojo/application/public/cpp/application_connection.h" |   19 #include "mojo/application/public/cpp/application_connection.h" | 
|   21 #include "mojo/application/public/cpp/application_delegate.h" |   20 #include "mojo/application/public/cpp/application_delegate.h" | 
|   22 #include "mojo/application/public/cpp/application_impl.h" |   21 #include "mojo/application/public/cpp/application_impl.h" | 
 |   22 #include "mojo/application/public/cpp/application_test_base.h" | 
|   23 #include "mojo/application/public/cpp/service_provider_impl.h" |   23 #include "mojo/application/public/cpp/service_provider_impl.h" | 
|   24 #include "ui/mojo/geometry/geometry_util.h" |   24 #include "ui/mojo/geometry/geometry_util.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) { | 
| (...skipping 572 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  605     view11->SetFocus(); |  605     view11->SetFocus(); | 
|  606     ASSERT_TRUE(DoRunLoopWithTimeout()); |  606     ASSERT_TRUE(DoRunLoopWithTimeout()); | 
|  607     ASSERT_NE(nullptr, observer.last_gained_focus()); |  607     ASSERT_NE(nullptr, observer.last_gained_focus()); | 
|  608     ASSERT_NE(nullptr, observer.last_lost_focus()); |  608     ASSERT_NE(nullptr, observer.last_lost_focus()); | 
|  609     EXPECT_EQ(view11->id(), observer.last_gained_focus()->id()); |  609     EXPECT_EQ(view11->id(), observer.last_gained_focus()->id()); | 
|  610     EXPECT_EQ(embedded->GetRoot()->id(), observer.last_lost_focus()->id()); |  610     EXPECT_EQ(embedded->GetRoot()->id(), observer.last_lost_focus()->id()); | 
|  611   } |  611   } | 
|  612 } |  612 } | 
|  613  |  613  | 
|  614 }  // namespace mojo |  614 }  // namespace mojo | 
| OLD | NEW |