| 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 "base/run_loop.h" | 8 #include "base/run_loop.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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 void OnApplicationError(mojo::ApplicationManager* application_manager, | 90 void OnApplicationError(mojo::ApplicationManager* application_manager, |
| 91 const GURL& url) override {} | 91 const GURL& url) override {} |
| 92 | 92 |
| 93 // Overridden from mojo::ApplicationDelegate: | 93 // Overridden from mojo::ApplicationDelegate: |
| 94 void Initialize(ApplicationImpl* app) override { | 94 void Initialize(ApplicationImpl* app) override { |
| 95 view_manager_client_factory_.reset( | 95 view_manager_client_factory_.reset( |
| 96 new mojo::ViewManagerClientFactory(app->shell(), this)); | 96 new mojo::ViewManagerClientFactory(app->shell(), this)); |
| 97 } | 97 } |
| 98 | 98 |
| 99 bool ConfigureIncomingConnection( | 99 bool ConfigureIncomingConnection( |
| 100 mojo::ApplicationConnection* connection) override { | 100 mojo::ApplicationConnection* connection, |
| 101 const std::string& url) override { |
| 101 connection->AddService(view_manager_client_factory_.get()); | 102 connection->AddService(view_manager_client_factory_.get()); |
| 102 return true; | 103 return true; |
| 103 } | 104 } |
| 104 | 105 |
| 105 // Overridden from mojo::ViewManagerDelegate: | 106 // Overridden from mojo::ViewManagerDelegate: |
| 106 void OnEmbed(View* root, | 107 void OnEmbed(View* root, |
| 107 mojo::InterfaceRequest<mojo::ServiceProvider> services, | 108 mojo::InterfaceRequest<mojo::ServiceProvider> services, |
| 108 mojo::ServiceProviderPtr exposed_services) override { | 109 mojo::ServiceProviderPtr exposed_services) override { |
| 109 root_added_callback_.Run(root); | 110 root_added_callback_.Run(root); |
| 110 } | 111 } |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 253 EXPECT_EQ(id, first_window); | 254 EXPECT_EQ(id, first_window); |
| 254 | 255 |
| 255 Id second_window = OpenWindow(); | 256 Id second_window = OpenWindow(); |
| 256 window_manager_->ActivateWindow(second_window, | 257 window_manager_->ActivateWindow(second_window, |
| 257 base::Bind(&EmptyResultCallback)); | 258 base::Bind(&EmptyResultCallback)); |
| 258 id = WaitForActiveWindowChange(); | 259 id = WaitForActiveWindowChange(); |
| 259 EXPECT_EQ(id, second_window); | 260 EXPECT_EQ(id, second_window); |
| 260 } | 261 } |
| 261 | 262 |
| 262 } // namespace window_manager | 263 } // namespace window_manager |
| OLD | NEW |