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

Side by Side Diff: content/browser/browser_main_loop.cc

Issue 637183002: Replace FINAL and OVERRIDE with their C++11 counterparts in content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased the patch Created 6 years, 2 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 "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/logging.h" 10 #include "base/logging.h"
(...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 void ImmediateShutdownAndExitProcess() { 311 void ImmediateShutdownAndExitProcess() {
312 BrowserShutdownImpl::ImmediateShutdownAndExitProcess(); 312 BrowserShutdownImpl::ImmediateShutdownAndExitProcess();
313 } 313 }
314 314
315 // For measuring memory usage after each task. Behind a command line flag. 315 // For measuring memory usage after each task. Behind a command line flag.
316 class BrowserMainLoop::MemoryObserver : public base::MessageLoop::TaskObserver { 316 class BrowserMainLoop::MemoryObserver : public base::MessageLoop::TaskObserver {
317 public: 317 public:
318 MemoryObserver() {} 318 MemoryObserver() {}
319 virtual ~MemoryObserver() {} 319 virtual ~MemoryObserver() {}
320 320
321 virtual void WillProcessTask(const base::PendingTask& pending_task) OVERRIDE { 321 virtual void WillProcessTask(const base::PendingTask& pending_task) override {
322 } 322 }
323 323
324 virtual void DidProcessTask(const base::PendingTask& pending_task) OVERRIDE { 324 virtual void DidProcessTask(const base::PendingTask& pending_task) override {
325 #if !defined(OS_IOS) // No ProcessMetrics on IOS. 325 #if !defined(OS_IOS) // No ProcessMetrics on IOS.
326 scoped_ptr<base::ProcessMetrics> process_metrics( 326 scoped_ptr<base::ProcessMetrics> process_metrics(
327 base::ProcessMetrics::CreateProcessMetrics( 327 base::ProcessMetrics::CreateProcessMetrics(
328 #if defined(OS_MACOSX) 328 #if defined(OS_MACOSX)
329 base::GetCurrentProcessHandle(), NULL)); 329 base::GetCurrentProcessHandle(), NULL));
330 #else 330 #else
331 base::GetCurrentProcessHandle())); 331 base::GetCurrentProcessHandle()));
332 #endif 332 #endif
333 size_t private_bytes; 333 size_t private_bytes;
334 process_metrics->GetMemoryBytes(&private_bytes, NULL); 334 process_metrics->GetMemoryBytes(&private_bytes, NULL);
(...skipping 872 matching lines...) Expand 10 before | Expand all | Expand 10 after
1207 1207
1208 void BrowserMainLoop::EndStartupTracing() { 1208 void BrowserMainLoop::EndStartupTracing() {
1209 is_tracing_startup_ = false; 1209 is_tracing_startup_ = false;
1210 TracingController::GetInstance()->DisableRecording( 1210 TracingController::GetInstance()->DisableRecording(
1211 TracingController::CreateFileSink( 1211 TracingController::CreateFileSink(
1212 startup_trace_file_, 1212 startup_trace_file_,
1213 base::Bind(OnStoppedStartupTracing, startup_trace_file_))); 1213 base::Bind(OnStoppedStartupTracing, startup_trace_file_)));
1214 } 1214 }
1215 1215
1216 } // namespace content 1216 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/browser_child_process_host_impl.h ('k') | content/browser/browser_main_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698