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 "content/browser/browser_main_loop.h" | 5 #include "content/browser/browser_main_loop.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
10 #include "base/file_util.h" | 10 #include "base/file_util.h" |
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
322 #if !defined(OS_IOS) // No ProcessMetrics on IOS. | 322 #if !defined(OS_IOS) // No ProcessMetrics on IOS. |
323 scoped_ptr<base::ProcessMetrics> process_metrics( | 323 scoped_ptr<base::ProcessMetrics> process_metrics( |
324 base::ProcessMetrics::CreateProcessMetrics( | 324 base::ProcessMetrics::CreateProcessMetrics( |
325 #if defined(OS_MACOSX) | 325 #if defined(OS_MACOSX) |
326 base::GetCurrentProcessHandle(), NULL)); | 326 base::GetCurrentProcessHandle(), NULL)); |
327 #else | 327 #else |
328 base::GetCurrentProcessHandle())); | 328 base::GetCurrentProcessHandle())); |
329 #endif | 329 #endif |
330 size_t private_bytes; | 330 size_t private_bytes; |
331 process_metrics->GetMemoryBytes(&private_bytes, NULL); | 331 process_metrics->GetMemoryBytes(&private_bytes, NULL); |
332 HISTOGRAM_MEMORY_KB("Memory.BrowserUsed", private_bytes >> 10); | 332 LOCAL_HISTOGRAM_MEMORY_KB("Memory.BrowserUsed", private_bytes >> 10); |
333 #endif | 333 #endif |
334 } | 334 } |
335 private: | 335 private: |
336 DISALLOW_COPY_AND_ASSIGN(MemoryObserver); | 336 DISALLOW_COPY_AND_ASSIGN(MemoryObserver); |
337 }; | 337 }; |
338 | 338 |
339 | 339 |
340 // BrowserMainLoop construction / destruction ============================= | 340 // BrowserMainLoop construction / destruction ============================= |
341 | 341 |
342 BrowserMainLoop* BrowserMainLoop::GetInstance() { | 342 BrowserMainLoop* BrowserMainLoop::GetInstance() { |
(...skipping 854 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1197 &BrowserMainLoop::EndStartupTracing); | 1197 &BrowserMainLoop::EndStartupTracing); |
1198 } | 1198 } |
1199 | 1199 |
1200 void BrowserMainLoop::EndStartupTracing() { | 1200 void BrowserMainLoop::EndStartupTracing() { |
1201 is_tracing_startup_ = false; | 1201 is_tracing_startup_ = false; |
1202 TracingController::GetInstance()->DisableRecording( | 1202 TracingController::GetInstance()->DisableRecording( |
1203 startup_trace_file_, base::Bind(&OnStoppedStartupTracing)); | 1203 startup_trace_file_, base::Bind(&OnStoppedStartupTracing)); |
1204 } | 1204 } |
1205 | 1205 |
1206 } // namespace content | 1206 } // namespace content |
OLD | NEW |