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

Unified Diff: mojo/examples/browser/browser.cc

Issue 380413003: Mojo: Use InterfaceFactory<Interface> for service registration (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: convert everything over, remove ApplicationConnection::AddService Created 6 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: mojo/examples/browser/browser.cc
diff --git a/mojo/examples/browser/browser.cc b/mojo/examples/browser/browser.cc
index ac6f5f1dd1da4d12ecbcae5b9ed982dc3fa2ef82..6f5fcffe05855d64796b1c7df35461bc969f2b20 100644
--- a/mojo/examples/browser/browser.cc
+++ b/mojo/examples/browser/browser.cc
@@ -13,6 +13,7 @@
#include "mojo/services/public/cpp/view_manager/node.h"
#include "mojo/services/public/cpp/view_manager/view.h"
#include "mojo/services/public/cpp/view_manager/view_manager.h"
+#include "mojo/services/public/cpp/view_manager/view_manager_client_factory.h"
#include "mojo/services/public/cpp/view_manager/view_manager_delegate.h"
#include "mojo/services/public/cpp/view_manager/view_observer.h"
#include "mojo/services/public/interfaces/navigation/navigation.mojom.h"
@@ -151,7 +152,11 @@ class Browser : public ApplicationDelegate,
public views::TextfieldController,
public view_manager::NodeObserver {
public:
- Browser() : view_manager_(NULL), root_(NULL), widget_(NULL) {}
+ Browser()
+ : view_manager_(NULL),
+ view_manager_client_factory_(this),
+ root_(NULL),
+ widget_(NULL) {}
virtual ~Browser() {
}
@@ -166,7 +171,7 @@ class Browser : public ApplicationDelegate,
virtual bool ConfigureIncomingConnection(ApplicationConnection* connection)
MOJO_OVERRIDE {
- view_manager::ViewManager::ConfigureIncomingConnection(connection, this);
+ connection->AddServiceFactory(&view_manager_client_factory_);
return true;
}
@@ -246,6 +251,7 @@ class Browser : public ApplicationDelegate,
scoped_ptr<ViewsInit> views_init_;
view_manager::ViewManager* view_manager_;
+ view_manager::ViewManagerClientFactory view_manager_client_factory_;
view_manager::Node* root_;
views::Widget* widget_;
navigation::NavigatorHostPtr navigator_host_;

Powered by Google App Engine
This is Rietveld 408576698