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

Side by Side Diff: chrome/browser/ui/webui/about_ui.cc

Issue 1640123005: Revert of Have each SandboxedProcessLauncherDelegate maintain a zygote. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
« no previous file with comments | « chrome/browser/memory_details.cc ('k') | components/nacl/browser/nacl_process_host.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/browser/ui/webui/about_ui.h" 5 #include "chrome/browser/ui/webui/about_ui.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 728 matching lines...) Expand 10 before | Expand all | Expand 10 after
739 739
740 std::string AboutSandbox() { 740 std::string AboutSandbox() {
741 std::string data; 741 std::string data;
742 AppendHeader(&data, 0, l10n_util::GetStringUTF8(IDS_ABOUT_SANDBOX_TITLE)); 742 AppendHeader(&data, 0, l10n_util::GetStringUTF8(IDS_ABOUT_SANDBOX_TITLE));
743 AppendBody(&data); 743 AppendBody(&data);
744 data.append("<h1>"); 744 data.append("<h1>");
745 data.append(l10n_util::GetStringUTF8(IDS_ABOUT_SANDBOX_TITLE)); 745 data.append(l10n_util::GetStringUTF8(IDS_ABOUT_SANDBOX_TITLE));
746 data.append("</h1>"); 746 data.append("</h1>");
747 747
748 // Get expected sandboxing status of renderers. 748 // Get expected sandboxing status of renderers.
749 const int status = 749 const int status = content::ZygoteHost::GetInstance()->GetSandboxStatus();
750 content::ZygoteHost::GetInstance()->GetRendererSandboxStatus();
751 750
752 data.append("<table>"); 751 data.append("<table>");
753 752
754 AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_SUID_SANDBOX, 753 AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_SUID_SANDBOX,
755 status & content::kSandboxLinuxSUID); 754 status & content::kSandboxLinuxSUID);
756 AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_NAMESPACE_SANDBOX, 755 AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_NAMESPACE_SANDBOX,
757 status & content::kSandboxLinuxUserNS); 756 status & content::kSandboxLinuxUserNS);
758 AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_PID_NAMESPACES, 757 AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_PID_NAMESPACES,
759 status & content::kSandboxLinuxPIDNS); 758 status & content::kSandboxLinuxPIDNS);
760 AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_NET_NAMESPACES, 759 AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_NET_NAMESPACES,
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
1037 Profile* profile = Profile::FromWebUI(web_ui); 1036 Profile* profile = Profile::FromWebUI(web_ui);
1038 1037
1039 #if defined(ENABLE_THEMES) 1038 #if defined(ENABLE_THEMES)
1040 // Set up the chrome://theme/ source. 1039 // Set up the chrome://theme/ source.
1041 ThemeSource* theme = new ThemeSource(profile); 1040 ThemeSource* theme = new ThemeSource(profile);
1042 content::URLDataSource::Add(profile, theme); 1041 content::URLDataSource::Add(profile, theme);
1043 #endif 1042 #endif
1044 1043
1045 content::URLDataSource::Add(profile, new AboutUIHTMLSource(name, profile)); 1044 content::URLDataSource::Add(profile, new AboutUIHTMLSource(name, profile));
1046 } 1045 }
OLDNEW
« no previous file with comments | « chrome/browser/memory_details.cc ('k') | components/nacl/browser/nacl_process_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698