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

Unified Diff: components/web_view/frame_tree.h

Issue 1323233004: Adds better security checking to OnCreatedFrame() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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/web_view/frame_apptest.cc ('k') | components/web_view/frame_tree.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/web_view/frame_tree.h
diff --git a/components/web_view/frame_tree.h b/components/web_view/frame_tree.h
index 9ce6b20869cfd8c2e3bdd78479c497b56622a5e5..57a12bbdb607d44b50d50a3df5357101f3f86d72 100644
--- a/components/web_view/frame_tree.h
+++ b/components/web_view/frame_tree.h
@@ -5,6 +5,7 @@
#ifndef COMPONENTS_WEB_VIEW_FRAME_TREE_H_
#define COMPONENTS_WEB_VIEW_FRAME_TREE_H_
+#include "components/view_manager/public/interfaces/view_tree.mojom.h"
#include "components/web_view/frame.h"
#include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"
@@ -32,6 +33,7 @@ class FrameTree {
// See Frame for details on app id's.
FrameTree(uint32_t root_app_id,
mojo::View* view,
+ mojo::ViewTreeClientPtr view_tree_client,
FrameTreeDelegate* delegate,
FrameTreeClient* root_client,
scoped_ptr<FrameUserData> user_data,
@@ -56,10 +58,10 @@ class FrameTree {
// that it is sharing the FrameTreeClient/FrameTreeServer of |parent|. There
// may or may not be a View identified by |frame_id| yet. See Frame for
// details.
- void CreateSharedFrame(Frame* parent,
- uint32_t frame_id,
- uint32_t app_id,
- const Frame::ClientPropertyMap& client_properties);
+ Frame* CreateSharedFrame(Frame* parent,
+ uint32_t frame_id,
+ uint32_t app_id,
+ const Frame::ClientPropertyMap& client_properties);
private:
friend class Frame;
« no previous file with comments | « components/web_view/frame_apptest.cc ('k') | components/web_view/frame_tree.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698