| 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 "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/memory/scoped_vector.h" | 7 #include "base/memory/scoped_vector.h" |
| 8 #include "mojo/application_manager/application_manager.h" | 8 #include "mojo/application_manager/application_manager.h" |
| 9 #include "mojo/public/cpp/application/application_delegate.h" | 9 #include "mojo/public/cpp/application/application_delegate.h" |
| 10 #include "mojo/public/cpp/application/application_impl.h" | 10 #include "mojo/public/cpp/application/application_impl.h" |
| 11 #include "mojo/public/cpp/application/service_provider_impl.h" | 11 #include "mojo/public/cpp/application/service_provider_impl.h" |
| 12 #include "mojo/public/interfaces/application/service_provider.mojom.h" | 12 #include "mojo/public/interfaces/application/service_provider.mojom.h" |
| 13 #include "mojo/services/public/cpp/view_manager/types.h" | 13 #include "mojo/services/public/cpp/view_manager/types.h" |
| 14 #include "mojo/services/public/cpp/view_manager/view.h" | 14 #include "mojo/services/public/cpp/view_manager/view.h" |
| 15 #include "mojo/services/public/cpp/view_manager/view_manager.h" | 15 #include "mojo/services/public/cpp/view_manager/view_manager.h" |
| 16 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h" | 16 #include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h" |
| 17 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" | 17 #include "mojo/services/public/cpp/view_manager/view_manager_delegate.h" |
| 18 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h" | 18 #include "mojo/services/public/interfaces/view_manager/view_manager.mojom.h" |
| 19 #include "mojo/services/public/interfaces/window_manager/window_manager.mojom.h" | 19 #include "mojo/services/public/interfaces/window_manager/window_manager.mojom.h" |
| 20 #include "mojo/shell/shell_test_helper.h" | 20 #include "shell/shell_test_helper.h" |
| 21 #include "testing/gtest/include/gtest/gtest.h" | 21 #include "testing/gtest/include/gtest/gtest.h" |
| 22 | 22 |
| 23 namespace mojo { | 23 namespace mojo { |
| 24 namespace { | 24 namespace { |
| 25 | 25 |
| 26 const char kTestServiceURL[] = "mojo:test_url"; | 26 const char kTestServiceURL[] = "mojo:test_url"; |
| 27 | 27 |
| 28 void EmptyResultCallback(bool result) {} | 28 void EmptyResultCallback(bool result) {} |
| 29 | 29 |
| 30 class TestWindowManagerClient : public WindowManagerClient { | 30 class TestWindowManagerClient : public WindowManagerClient { |
| (...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 255 | 255 |
| 256 Id second_window = OpenWindow(); | 256 Id second_window = OpenWindow(); |
| 257 window_manager_->ActivateWindow(second_window, | 257 window_manager_->ActivateWindow(second_window, |
| 258 base::Bind(&EmptyResultCallback)); | 258 base::Bind(&EmptyResultCallback)); |
| 259 ids = WaitForActiveWindowChange(); | 259 ids = WaitForActiveWindowChange(); |
| 260 EXPECT_EQ(ids.first, first_window); | 260 EXPECT_EQ(ids.first, first_window); |
| 261 EXPECT_EQ(ids.second, second_window); | 261 EXPECT_EQ(ids.second, second_window); |
| 262 } | 262 } |
| 263 | 263 |
| 264 } // namespace mojo | 264 } // namespace mojo |
| OLD | NEW |