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

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

Issue 1532423003: Have each SandboxedProcessLauncherDelegate maintain a zygote. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fetch sandbox status Created 4 years, 12 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
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 <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 723 matching lines...) Expand 10 before | Expand all | Expand 10 after
734 734
735 std::string AboutSandbox() { 735 std::string AboutSandbox() {
736 std::string data; 736 std::string data;
737 AppendHeader(&data, 0, l10n_util::GetStringUTF8(IDS_ABOUT_SANDBOX_TITLE)); 737 AppendHeader(&data, 0, l10n_util::GetStringUTF8(IDS_ABOUT_SANDBOX_TITLE));
738 AppendBody(&data); 738 AppendBody(&data);
739 data.append("<h1>"); 739 data.append("<h1>");
740 data.append(l10n_util::GetStringUTF8(IDS_ABOUT_SANDBOX_TITLE)); 740 data.append(l10n_util::GetStringUTF8(IDS_ABOUT_SANDBOX_TITLE));
741 data.append("</h1>"); 741 data.append("</h1>");
742 742
743 // Get expected sandboxing status of renderers. 743 // Get expected sandboxing status of renderers.
744 const int status = content::ZygoteHost::GetInstance()->GetSandboxStatus(); 744 const int status =
745 content::ZygoteHost::GetInstance()->GetRendererSandboxStatus();
745 746
746 data.append("<table>"); 747 data.append("<table>");
747 748
748 AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_SUID_SANDBOX, 749 AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_SUID_SANDBOX,
749 status & content::kSandboxLinuxSUID); 750 status & content::kSandboxLinuxSUID);
750 AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_NAMESPACE_SANDBOX, 751 AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_NAMESPACE_SANDBOX,
751 status & content::kSandboxLinuxUserNS); 752 status & content::kSandboxLinuxUserNS);
752 AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_PID_NAMESPACES, 753 AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_PID_NAMESPACES,
753 status & content::kSandboxLinuxPIDNS); 754 status & content::kSandboxLinuxPIDNS);
754 AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_NET_NAMESPACES, 755 AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_NET_NAMESPACES,
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
1031 Profile* profile = Profile::FromWebUI(web_ui); 1032 Profile* profile = Profile::FromWebUI(web_ui);
1032 1033
1033 #if defined(ENABLE_THEMES) 1034 #if defined(ENABLE_THEMES)
1034 // Set up the chrome://theme/ source. 1035 // Set up the chrome://theme/ source.
1035 ThemeSource* theme = new ThemeSource(profile); 1036 ThemeSource* theme = new ThemeSource(profile);
1036 content::URLDataSource::Add(profile, theme); 1037 content::URLDataSource::Add(profile, theme);
1037 #endif 1038 #endif
1038 1039
1039 content::URLDataSource::Add(profile, new AboutUIHTMLSource(name, profile)); 1040 content::URLDataSource::Add(profile, new AboutUIHTMLSource(name, profile));
1040 } 1041 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698