| 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" |
| (...skipping 244 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 |