diff options
| author | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-13 18:31:56 +0000 |
|---|---|---|
| committer | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-13 18:31:56 +0000 |
| commit | 5fbdc5f5a5dfe913d58ddd2f06808ecda351ae3a (patch) | |
| tree | 3919f97e7c1d1b8fc4891c5ee0e6280f13e90cb7 /chrome/browser/feedback | |
| parent | 1bd918d2e2fd61863263c2292b4d618822275768 (diff) | |
| download | chromium_src-5fbdc5f5a5dfe913d58ddd2f06808ecda351ae3a.zip chromium_src-5fbdc5f5a5dfe913d58ddd2f06808ecda351ae3a.tar.gz chromium_src-5fbdc5f5a5dfe913d58ddd2f06808ecda351ae3a.tar.bz2 | |
Add link to download packaged performance data from feedback UI
BUG=303790
Review URL: https://codereview.chromium.org/26572009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@228407 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/feedback')
| -rw-r--r-- | chrome/browser/feedback/feedback_data.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/feedback/feedback_data.h | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/feedback/feedback_data.cc b/chrome/browser/feedback/feedback_data.cc index 198ea03..7c1aff7 100644 --- a/chrome/browser/feedback/feedback_data.cc +++ b/chrome/browser/feedback/feedback_data.cc @@ -113,7 +113,7 @@ void FeedbackData::SetAndCompressSystemInfo( if (!manager || !manager->GetTraceData( trace_id_, - base::Bind(&FeedbackData::OnGetTraceData, this))) { + base::Bind(&FeedbackData::OnGetTraceData, this, trace_id_))) { trace_id_ = 0; } } @@ -134,8 +134,12 @@ void FeedbackData::SetAndCompressSystemInfo( } void FeedbackData::OnGetTraceData( + int trace_id_, scoped_refptr<base::RefCountedString> trace_data) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + TracingManager* manager = TracingManager::Get(); + if (manager) + manager->DiscardTraceData(trace_id_); scoped_ptr<std::string> data(new std::string(trace_data->data())); diff --git a/chrome/browser/feedback/feedback_data.h b/chrome/browser/feedback/feedback_data.h index f88b007..a33ae12 100644 --- a/chrome/browser/feedback/feedback_data.h +++ b/chrome/browser/feedback/feedback_data.h @@ -94,7 +94,8 @@ class FeedbackData : public base::RefCountedThreadSafe<FeedbackData> { virtual ~FeedbackData(); - void OnGetTraceData(scoped_refptr<base::RefCountedString> trace_data); + void OnGetTraceData(int trace_id, + scoped_refptr<base::RefCountedString> trace_data); Profile* profile_; |