OLD | NEW |
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 Loading... |
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 = content::ZygoteHost::GetInstance()->GetSandboxStatus(); | 749 const int status = |
| 750 content::ZygoteHost::GetInstance()->GetRendererSandboxStatus(); |
750 | 751 |
751 data.append("<table>"); | 752 data.append("<table>"); |
752 | 753 |
753 AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_SUID_SANDBOX, | 754 AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_SUID_SANDBOX, |
754 status & content::kSandboxLinuxSUID); | 755 status & content::kSandboxLinuxSUID); |
755 AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_NAMESPACE_SANDBOX, | 756 AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_NAMESPACE_SANDBOX, |
756 status & content::kSandboxLinuxUserNS); | 757 status & content::kSandboxLinuxUserNS); |
757 AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_PID_NAMESPACES, | 758 AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_PID_NAMESPACES, |
758 status & content::kSandboxLinuxPIDNS); | 759 status & content::kSandboxLinuxPIDNS); |
759 AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_NET_NAMESPACES, | 760 AboutSandboxRow(&data, IDS_ABOUT_SANDBOX_NET_NAMESPACES, |
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1036 Profile* profile = Profile::FromWebUI(web_ui); | 1037 Profile* profile = Profile::FromWebUI(web_ui); |
1037 | 1038 |
1038 #if defined(ENABLE_THEMES) | 1039 #if defined(ENABLE_THEMES) |
1039 // Set up the chrome://theme/ source. | 1040 // Set up the chrome://theme/ source. |
1040 ThemeSource* theme = new ThemeSource(profile); | 1041 ThemeSource* theme = new ThemeSource(profile); |
1041 content::URLDataSource::Add(profile, theme); | 1042 content::URLDataSource::Add(profile, theme); |
1042 #endif | 1043 #endif |
1043 | 1044 |
1044 content::URLDataSource::Add(profile, new AboutUIHTMLSource(name, profile)); | 1045 content::URLDataSource::Add(profile, new AboutUIHTMLSource(name, profile)); |
1045 } | 1046 } |
OLD | NEW |