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 "chrome/browser/ui/webui/memory_internals/memory_internals_proxy.h" | 5 #include "chrome/browser/ui/webui/memory_internals/memory_internals_proxy.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
11 #include "base/string16.h" | 11 #include "base/string16.h" |
12 #include "base/stringprintf.h" | 12 #include "base/stringprintf.h" |
13 #include "base/strings/string_number_conversions.h" | 13 #include "base/strings/string_number_conversions.h" |
| 14 #include "base/strings/utf_string_conversions.h" |
14 #include "base/sys_info.h" | 15 #include "base/sys_info.h" |
15 #include "base/utf_string_conversions.h" | |
16 #include "base/values.h" | 16 #include "base/values.h" |
17 #include "chrome/browser/browser_process.h" | 17 #include "chrome/browser/browser_process.h" |
18 #include "chrome/browser/defaults.h" | 18 #include "chrome/browser/defaults.h" |
19 #include "chrome/browser/extensions/extension_service.h" | 19 #include "chrome/browser/extensions/extension_service.h" |
20 #include "chrome/browser/extensions/extension_system.h" | 20 #include "chrome/browser/extensions/extension_system.h" |
21 #include "chrome/browser/memory_details.h" | 21 #include "chrome/browser/memory_details.h" |
22 #include "chrome/browser/profiles/profile.h" | 22 #include "chrome/browser/profiles/profile.h" |
23 #include "chrome/browser/profiles/profile_manager.h" | 23 #include "chrome/browser/profiles/profile_manager.h" |
24 #include "chrome/browser/ui/webui/memory_internals/memory_internals_handler.h" | 24 #include "chrome/browser/ui/webui/memory_internals/memory_internals_handler.h" |
25 #include "chrome/common/extensions/extension.h" | 25 #include "chrome/common/extensions/extension.h" |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
127 | 127 |
128 void MemoryInternalsProxy::CallJavaScriptFunctionOnUIThread( | 128 void MemoryInternalsProxy::CallJavaScriptFunctionOnUIThread( |
129 const std::string& function, base::Value* args) { | 129 const std::string& function, base::Value* args) { |
130 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 130 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
131 | 131 |
132 std::vector<const base::Value*> args_vector; | 132 std::vector<const base::Value*> args_vector; |
133 args_vector.push_back(args); | 133 args_vector.push_back(args); |
134 string16 update = content::WebUI::GetJavascriptCall(function, args_vector); | 134 string16 update = content::WebUI::GetJavascriptCall(function, args_vector); |
135 UpdateUIOnUIThread(update); | 135 UpdateUIOnUIThread(update); |
136 } | 136 } |
OLD | NEW |