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

Unified Diff: mojo/services/view_manager/public/cpp/tests/view_manager_unittest.cc

Issue 815003002: Nukes ViewManager arg from ViewManagerDelegate::OnEmbed (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: format Created 6 years 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 side-by-side diff with in-line comments
Download patch
Index: mojo/services/view_manager/public/cpp/tests/view_manager_unittest.cc
diff --git a/mojo/services/view_manager/public/cpp/tests/view_manager_unittest.cc b/mojo/services/view_manager/public/cpp/tests/view_manager_unittest.cc
index 1c5d46cd8c0f1914ef5e852a2222dd038560853d..044fffccf022fb8b3772fd54b2f805c93e152287 100644
--- a/mojo/services/view_manager/public/cpp/tests/view_manager_unittest.cc
+++ b/mojo/services/view_manager/public/cpp/tests/view_manager_unittest.cc
@@ -47,7 +47,7 @@ class ConnectApplicationLoader : public ApplicationLoader,
public ApplicationDelegate,
public ViewManagerDelegate {
public:
- typedef base::Callback<void(ViewManager*, View*)> LoadedCallback;
+ typedef base::Callback<void(View*)> LoadedCallback;
explicit ConnectApplicationLoader(const LoadedCallback& callback)
: callback_(callback) {}
@@ -80,11 +80,10 @@ class ConnectApplicationLoader : public ApplicationLoader,
}
// Overridden from ViewManagerDelegate:
- void OnEmbed(ViewManager* view_manager,
- View* root,
+ void OnEmbed(View* root,
ServiceProviderImpl* exported_services,
scoped_ptr<ServiceProvider> imported_services) override {
- callback_.Run(view_manager, root);
+ callback_.Run(root);
}
void OnViewManagerDisconnected(ViewManager* view_manager) override {}
@@ -317,8 +316,8 @@ class ViewManagerTest : public testing::Test {
// TODO(sky): resolve this. Need to establish initial connection.
}
- void OnViewManagerLoaded(ViewManager* view_manager, View* root) {
- loaded_view_manager_ = view_manager;
+ void OnViewManagerLoaded(View* root) {
+ loaded_view_manager_ = root->view_manager();
connect_loop_->Quit();
}

Powered by Google App Engine
This is Rietveld 408576698