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 <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 854 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
865 base::DictionaryValue* browser_data = new base::DictionaryValue(); | 865 base::DictionaryValue* browser_data = new base::DictionaryValue(); |
866 browsers->Append(browser_data); | 866 browsers->Append(browser_data); |
867 browser_data->SetString("name", browser_processes[index].name); | 867 browser_data->SetString("name", browser_processes[index].name); |
868 | 868 |
869 BindProcessMetrics(browser_data, &aggregate); | 869 BindProcessMetrics(browser_data, &aggregate); |
870 | 870 |
871 // We log memory info as we record it. | 871 // We log memory info as we record it. |
872 if (!log_string.empty()) | 872 if (!log_string.empty()) |
873 log_string += base::ASCIIToUTF16(", "); | 873 log_string += base::ASCIIToUTF16(", "); |
874 log_string += browser_processes[index].name + base::ASCIIToUTF16(", ") + | 874 log_string += browser_processes[index].name + base::ASCIIToUTF16(", ") + |
875 base::Int64ToString16(aggregate.working_set.priv) + | 875 base::SizeTToString16(aggregate.working_set.priv) + |
876 base::ASCIIToUTF16(", ") + | 876 base::ASCIIToUTF16(", ") + |
877 base::Int64ToString16(aggregate.working_set.shared) + | 877 base::SizeTToString16(aggregate.working_set.shared) + |
878 base::ASCIIToUTF16(", ") + | 878 base::ASCIIToUTF16(", ") + |
879 base::Int64ToString16(aggregate.working_set.shareable); | 879 base::SizeTToString16(aggregate.working_set.shareable); |
880 } | 880 } |
881 if (!log_string.empty()) | 881 if (!log_string.empty()) |
882 VLOG(1) << "memory: " << log_string; | 882 VLOG(1) << "memory: " << log_string; |
883 | 883 |
884 // Set the browser & renderer detailed process data. | 884 // Set the browser & renderer detailed process data. |
885 base::DictionaryValue* browser_data = new base::DictionaryValue(); | 885 base::DictionaryValue* browser_data = new base::DictionaryValue(); |
886 root->Set("browzr_data", browser_data); | 886 root->Set("browzr_data", browser_data); |
887 base::ListValue* child_data = new base::ListValue(); | 887 base::ListValue* child_data = new base::ListValue(); |
888 root->Set("child_data", child_data); | 888 root->Set("child_data", child_data); |
889 | 889 |
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1030 Profile* profile = Profile::FromWebUI(web_ui); | 1030 Profile* profile = Profile::FromWebUI(web_ui); |
1031 | 1031 |
1032 #if defined(ENABLE_THEMES) | 1032 #if defined(ENABLE_THEMES) |
1033 // Set up the chrome://theme/ source. | 1033 // Set up the chrome://theme/ source. |
1034 ThemeSource* theme = new ThemeSource(profile); | 1034 ThemeSource* theme = new ThemeSource(profile); |
1035 content::URLDataSource::Add(profile, theme); | 1035 content::URLDataSource::Add(profile, theme); |
1036 #endif | 1036 #endif |
1037 | 1037 |
1038 content::URLDataSource::Add(profile, new AboutUIHTMLSource(name, profile)); | 1038 content::URLDataSource::Add(profile, new AboutUIHTMLSource(name, profile)); |
1039 } | 1039 } |
OLD | NEW |