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

Unified Diff: mandoline/tab/frame_connection.h

Issue 1254383016: ApplicationConnection lifetime management changes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 4 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
« no previous file with comments | « components/view_manager/view_manager_service_apptest.cc ('k') | mandoline/ui/browser/browser.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mandoline/tab/frame_connection.h
diff --git a/mandoline/tab/frame_connection.h b/mandoline/tab/frame_connection.h
index 2aa355889f9c21f1466c45f16b6602d61598709d..63065e9a29d14fada01201b54854baec2707e9bb 100644
--- a/mandoline/tab/frame_connection.h
+++ b/mandoline/tab/frame_connection.h
@@ -6,6 +6,7 @@
#define MANDOLINE_TAB_FRAME_CONNECTION_H_
#include "base/basictypes.h"
+#include "base/memory/scoped_ptr.h"
#include "components/view_manager/public/interfaces/view_manager.mojom.h"
#include "mandoline/tab/frame_user_data.h"
#include "mandoline/tab/public/interfaces/frame_tree.mojom.h"
@@ -33,14 +34,14 @@ class FrameConnection : public FrameUserData {
FrameTreeClient* frame_tree_client() { return frame_tree_client_.get(); }
mojo::ApplicationConnection* application_connection() {
- return application_connection_;
+ return application_connection_.get();
}
private:
FrameTreeClientPtr frame_tree_client_;
// TODO(sky): needs to be destroyed when connection lost.
- mojo::ApplicationConnection* application_connection_;
+ scoped_ptr<mojo::ApplicationConnection> application_connection_;
DISALLOW_COPY_AND_ASSIGN(FrameConnection);
};
« no previous file with comments | « components/view_manager/view_manager_service_apptest.cc ('k') | mandoline/ui/browser/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698