content/browser/frame_host/frame_tree.cc - Issue 1208143002: Move existing kSitePerProcess checks to a policy-oracle object

Side by Side Diff: content/browser/frame_host/frame_tree.cc

Issue 1208143002: Move existing kSitePerProcess checks to a policy-oracle object (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@swapped_out_cmdline_checks

Patch Set: Partial fixes to Nasko's comments. Created 5 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 unified diff | Download patch

« content/browser/child_process_security_policy_impl.cc ('K') | « content/browser/cross_site_transfer_browsertest.cc ('k') | content/browser/frame_host/frame_tree_browsertest.cc » ('j') | content/browser/frame_host/render_frame_host_manager.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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 "content/browser/frame_host/frame_tree.h"	5 #include "content/browser/frame_host/frame_tree.h"

6	6

7 #include <queue>	7 #include <queue>

8	8

9 #include "base/bind.h"	9 #include "base/bind.h"

10 #include "base/callback.h"	10 #include "base/callback.h"

11 #include "base/command_line.h"

12 #include "base/containers/hash_tables.h"	11 #include "base/containers/hash_tables.h"

13 #include "base/lazy_instance.h"	12 #include "base/lazy_instance.h"

14 #include "content/browser/frame_host/frame_tree_node.h"	13 #include "content/browser/frame_host/frame_tree_node.h"

15 #include "content/browser/frame_host/navigator.h"	14 #include "content/browser/frame_host/navigator.h"

16 #include "content/browser/frame_host/render_frame_host_factory.h"	15 #include "content/browser/frame_host/render_frame_host_factory.h"

17 #include "content/browser/frame_host/render_frame_host_impl.h"	16 #include "content/browser/frame_host/render_frame_host_impl.h"

18 #include "content/browser/frame_host/render_frame_proxy_host.h"	17 #include "content/browser/frame_host/render_frame_proxy_host.h"

19 #include "content/browser/renderer_host/render_view_host_factory.h"	18 #include "content/browser/renderer_host/render_view_host_factory.h"

20 #include "content/browser/renderer_host/render_view_host_impl.h"	19 #include "content/browser/renderer_host/render_view_host_impl.h"

21 #include "content/public/common/content_switches.h"

22 #include "third_party/WebKit/public/web/WebSandboxFlags.h"	20 #include "third_party/WebKit/public/web/WebSandboxFlags.h"

23	21

24 namespace content {	22 namespace content {

25	23

26 namespace {	24 namespace {

27	25

28 // Used with FrameTree::ForEach() to search for the FrameTreeNode	26 // Used with FrameTree::ForEach() to search for the FrameTreeNode

29 // corresponding to \|frame_tree_node_id\| within a specific FrameTree.	27 // corresponding to \|frame_tree_node_id\| within a specific FrameTree.

30 bool FrameTreeNodeForId(int frame_tree_node_id,	28 bool FrameTreeNodeForId(int frame_tree_node_id,

31 FrameTreeNode** out_node,	29 FrameTreeNode** out_node,

(...skipping 365 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
397 load_progress_ = 0.0;	395 load_progress_ = 0.0;

398 }	396 }

399	397

400 bool FrameTree::IsLoading() {	398 bool FrameTree::IsLoading() {

401 bool is_loading = false;	399 bool is_loading = false;

402 ForEach(base::Bind(&IsNodeLoading, &is_loading));	400 ForEach(base::Bind(&IsNodeLoading, &is_loading));

403 return is_loading;	401 return is_loading;

404 }	402 }

405	403

406 } // namespace content	404 } // namespace content

OLD	NEW