| 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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 typedef base::Callback<void(View*)> RootAddedCallback; | 71 typedef base::Callback<void(View*)> RootAddedCallback; |
| 72 | 72 |
| 73 explicit TestApplicationLoader(const RootAddedCallback& root_added_callback) | 73 explicit TestApplicationLoader(const RootAddedCallback& root_added_callback) |
| 74 : root_added_callback_(root_added_callback) {} | 74 : root_added_callback_(root_added_callback) {} |
| 75 ~TestApplicationLoader() override {} | 75 ~TestApplicationLoader() override {} |
| 76 | 76 |
| 77 private: | 77 private: |
| 78 // Overridden from ApplicationLoader: | 78 // Overridden from ApplicationLoader: |
| 79 void Load(ApplicationManager* application_manager, | 79 void Load(ApplicationManager* application_manager, |
| 80 const GURL& url, | 80 const GURL& url, |
| 81 ScopedMessagePipeHandle shell_handle, |
| 81 scoped_refptr<LoadCallbacks> callbacks) override { | 82 scoped_refptr<LoadCallbacks> callbacks) override { |
| 82 ScopedMessagePipeHandle shell_handle = callbacks->RegisterApplication(); | 83 ASSERT_TRUE(shell_handle.is_valid()); |
| 83 if (!shell_handle.is_valid()) | |
| 84 return; | |
| 85 scoped_ptr<ApplicationImpl> app( | 84 scoped_ptr<ApplicationImpl> app( |
| 86 new ApplicationImpl(this, shell_handle.Pass())); | 85 new ApplicationImpl(this, shell_handle.Pass())); |
| 87 apps_.push_back(app.release()); | 86 apps_.push_back(app.release()); |
| 88 } | 87 } |
| 89 void OnApplicationError(ApplicationManager* application_manager, | 88 void OnApplicationError(ApplicationManager* application_manager, |
| 90 const GURL& url) override {} | 89 const GURL& url) override {} |
| 91 | 90 |
| 92 // Overridden from ApplicationDelegate: | 91 // Overridden from ApplicationDelegate: |
| 93 void Initialize(ApplicationImpl* app) override { | 92 void Initialize(ApplicationImpl* app) override { |
| 94 view_manager_client_factory_.reset( | 93 view_manager_client_factory_.reset( |
| (...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 256 | 255 |
| 257 Id second_window = OpenWindow(); | 256 Id second_window = OpenWindow(); |
| 258 window_manager_->ActivateWindow(second_window, | 257 window_manager_->ActivateWindow(second_window, |
| 259 base::Bind(&EmptyResultCallback)); | 258 base::Bind(&EmptyResultCallback)); |
| 260 ids = WaitForActiveWindowChange(); | 259 ids = WaitForActiveWindowChange(); |
| 261 EXPECT_EQ(ids.first, first_window); | 260 EXPECT_EQ(ids.first, first_window); |
| 262 EXPECT_EQ(ids.second, second_window); | 261 EXPECT_EQ(ids.second, second_window); |
| 263 } | 262 } |
| 264 | 263 |
| 265 } // namespace mojo | 264 } // namespace mojo |
| OLD | NEW |