Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Side by Side Diff: services/window_manager/window_manager_api_unittest.cc

Issue 814273005: Move application_manager from /mojo to /shell. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Rebase. Created 5 years, 11 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
OLDNEW
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 "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "mojo/application_manager/application_manager.h"
10 #include "mojo/public/cpp/application/application_delegate.h" 9 #include "mojo/public/cpp/application/application_delegate.h"
11 #include "mojo/public/cpp/application/application_impl.h" 10 #include "mojo/public/cpp/application/application_impl.h"
12 #include "mojo/public/cpp/application/service_provider_impl.h" 11 #include "mojo/public/cpp/application/service_provider_impl.h"
13 #include "mojo/public/interfaces/application/service_provider.mojom.h" 12 #include "mojo/public/interfaces/application/service_provider.mojom.h"
14 #include "mojo/services/view_manager/public/cpp/types.h" 13 #include "mojo/services/view_manager/public/cpp/types.h"
15 #include "mojo/services/view_manager/public/cpp/view.h" 14 #include "mojo/services/view_manager/public/cpp/view.h"
16 #include "mojo/services/view_manager/public/cpp/view_manager.h" 15 #include "mojo/services/view_manager/public/cpp/view_manager.h"
17 #include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h" 16 #include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
18 #include "mojo/services/view_manager/public/cpp/view_manager_delegate.h" 17 #include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
19 #include "mojo/services/view_manager/public/interfaces/view_manager.mojom.h" 18 #include "mojo/services/view_manager/public/interfaces/view_manager.mojom.h"
20 #include "mojo/services/window_manager/public/interfaces/window_manager.mojom.h" 19 #include "mojo/services/window_manager/public/interfaces/window_manager.mojom.h"
20 #include "shell/application_manager/application_manager.h"
21 #include "shell/shell_test_helper.h" 21 #include "shell/shell_test_helper.h"
22 #include "testing/gtest/include/gtest/gtest.h" 22 #include "testing/gtest/include/gtest/gtest.h"
23 23
24 using mojo::ApplicationImpl; 24 using mojo::ApplicationImpl;
25 using mojo::Id; 25 using mojo::Id;
26 using mojo::View; 26 using mojo::View;
27 27
28 namespace window_manager { 28 namespace window_manager {
29 namespace { 29 namespace {
30 30
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 261
262 Id second_window = OpenWindow(); 262 Id second_window = OpenWindow();
263 window_manager_->ActivateWindow(second_window, 263 window_manager_->ActivateWindow(second_window,
264 base::Bind(&EmptyResultCallback)); 264 base::Bind(&EmptyResultCallback));
265 ids = WaitForActiveWindowChange(); 265 ids = WaitForActiveWindowChange();
266 EXPECT_EQ(ids.first, first_window); 266 EXPECT_EQ(ids.first, first_window);
267 EXPECT_EQ(ids.second, second_window); 267 EXPECT_EQ(ids.second, second_window);
268 } 268 }
269 269
270 } // namespace window_manager 270 } // namespace window_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698