Implement TracingController::GetMonitoringStatus

content/browser/tracing/tracing_controller_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/tracing/tracing_controller_impl.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/file_util.h"
 #include "base/json/string_escape.h"
@@ skipping 170 matching lines @@
 
   if (!can_enable_recording())
     return false;
   is_recording_ = true;
 
 #if defined(OS_ANDROID)
   if (pending_get_categories_done_callback_.is_null())
     TraceLog::GetInstance()->AddClockSyncMetadataEvent();
 #endif
 
+  options_ = options;
   int trace_options = (options & RECORD_CONTINUOUSLY) ?
       TraceLog::RECORD_CONTINUOUSLY : TraceLog::RECORD_UNTIL_FULL;
   if (options & ENABLE_SAMPLING) {
     trace_options |=  TraceLog::ENABLE_SAMPLING;
   }
   // TODO(haraken): How to handle ENABLE_SYSTRACE?
 
   base::Closure on_enable_recording_done_callback =
       base::Bind(&TracingControllerImpl::OnEnableRecordingDone,
                  base::Unretained(this),
@@ skipping 26 matching lines @@
 }
 
 bool TracingControllerImpl::DisableRecording(
     const base::FilePath& result_file_path,
     const TracingFileResultCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (!can_disable_recording())
     return false;
 
+  options_ = TracingController::Options();
   // Disable local trace early to avoid traces during end-tracing process from
   // interfering with the process.
   base::Closure on_disable_recording_done_callback =
       base::Bind(&TracingControllerImpl::OnDisableRecordingDone,
                  base::Unretained(this),
                  result_file_path, callback);
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
       base::Bind(&TracingControllerImpl::SetDisabledOnFileThread,
                  base::Unretained(this),
                  on_disable_recording_done_callback));
@@ skipping 44 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (!can_enable_monitoring())
     return false;
   OnMonitoringStateChanged(true);
 
 #if defined(OS_ANDROID)
   TraceLog::GetInstance()->AddClockSyncMetadataEvent();
 #endif
 
+  options_ = options;
   int trace_options = 0;
   if (options & ENABLE_SAMPLING)
     trace_options |= TraceLog::ENABLE_SAMPLING;
 
   base::Closure on_enable_monitoring_done_callback =
       base::Bind(&TracingControllerImpl::OnEnableMonitoringDone,
                  base::Unretained(this),
                  category_filter, trace_options, callback);
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
       base::Bind(&TracingControllerImpl::SetEnabledOnFileThread,
@@ skipping 22 matching lines @@
     callback.Run();
 }
 
 bool TracingControllerImpl::DisableMonitoring(
     const DisableMonitoringDoneCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (!can_disable_monitoring())
     return false;
 
+  options_ = TracingController::Options();
   base::Closure on_disable_monitoring_done_callback =
       base::Bind(&TracingControllerImpl::OnDisableMonitoringDone,
                  base::Unretained(this), callback);
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
       base::Bind(&TracingControllerImpl::SetDisabledOnFileThread,
                  base::Unretained(this),
                  on_disable_monitoring_done_callback));
   return true;
 }
 
@@ skipping 10 matching lines @@
   }
 
   if (!callback.is_null())
     callback.Run();
 }
 
 void TracingControllerImpl::GetMonitoringStatus(
     bool* out_enabled,
     std::string* out_category_filter,
     TracingController::Options* out_options) {
-  NOTIMPLEMENTED();
+  *out_enabled = is_monitoring_;
+  *out_category_filter =
+    TraceLog::GetInstance()->GetCurrentCategoryFilter().ToString();
+  *out_options = options_;
 }
 
 bool TracingControllerImpl::CaptureMonitoringSnapshot(
     const base::FilePath& result_file_path,
     const TracingFileResultCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (!can_disable_monitoring())
     return false;
 
@@ skipping 396 matching lines @@
   }
 
   if (!watch_event_callback_.is_null())
     watch_event_callback_.Run();
 }
 
 void TracingControllerImpl::RegisterTracingUI(TracingUI* tracing_ui)
 {
   DCHECK(tracing_uis_.find(tracing_ui) == tracing_uis_.end());
   tracing_uis_.insert(tracing_ui);
-  tracing_ui->OnMonitoringStateChanged(is_monitoring_);

[haraken, 2014/01/16 02:32:14]

I expected that this will fire window.onMonitoringStateChanged in
profiling_view.js, but it didn't work. This is because profiling_view.js is not
initialized at this point.

Alternatively, we need to implement TracingController::GetMonitoringStatus and
make profiling_view.js call it when starting about:tracing.

 }
 
 void TracingControllerImpl::UnregisterTracingUI(TracingUI* tracing_ui)
 {
   std::set<TracingUI*>::iterator it = tracing_uis_.find(tracing_ui);
   DCHECK(it != tracing_uis_.end());
   tracing_uis_.erase(it);
 }
 
 void TracingControllerImpl::OnMonitoringStateChanged(bool is_monitoring)
 {
   if (is_monitoring_ == is_monitoring)
     return;
 
   is_monitoring_ = is_monitoring;
 #if !defined(OS_ANDROID)
   for (std::set<TracingUI*>::iterator it = tracing_uis_.begin();
        it != tracing_uis_.end(); it++) {
     (*it)->OnMonitoringStateChanged(is_monitoring);
   }
 #endif
 }
 
 }  // namespace content