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

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

Issue 8912009: Move BrowserMessageFilter to public, and into content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to LKGR. Created 9 years 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/profiler_message_filter.h" 5 #include "content/browser/profiler_message_filter.h"
6 6
7 #include "base/tracked_objects.h" 7 #include "base/tracked_objects.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "content/browser/profiler_controller_impl.h" 9 #include "content/browser/profiler_controller_impl.h"
10 #include "content/common/child_process_messages.h" 10 #include "content/common/child_process_messages.h"
11 11
12 using content::BrowserMessageFilter;
12 using content::BrowserThread; 13 using content::BrowserThread;
13 14
14 ProfilerMessageFilter::ProfilerMessageFilter() { 15 ProfilerMessageFilter::ProfilerMessageFilter() {
15 } 16 }
16 17
17 ProfilerMessageFilter::~ProfilerMessageFilter() { 18 ProfilerMessageFilter::~ProfilerMessageFilter() {
18 } 19 }
19 20
20 void ProfilerMessageFilter::OnChannelConnected(int32 peer_pid) { 21 void ProfilerMessageFilter::OnChannelConnected(int32 peer_pid) {
21 BrowserMessageFilter::OnChannelConnected(peer_pid); 22 BrowserMessageFilter::OnChannelConnected(peer_pid);
(...skipping 15 matching lines...) Expand all
37 38
38 void ProfilerMessageFilter::OnChildProfilerData( 39 void ProfilerMessageFilter::OnChildProfilerData(
39 int sequence_number, 40 int sequence_number,
40 const base::DictionaryValue& profiler_data) { 41 const base::DictionaryValue& profiler_data) {
41 base::DictionaryValue* dictionary_value = new base::DictionaryValue; 42 base::DictionaryValue* dictionary_value = new base::DictionaryValue;
42 dictionary_value->MergeDictionary(&profiler_data); 43 dictionary_value->MergeDictionary(&profiler_data);
43 // OnProfilerDataCollected assumes the ownership of profiler_data. 44 // OnProfilerDataCollected assumes the ownership of profiler_data.
44 content::ProfilerControllerImpl::GetInstance()->OnProfilerDataCollected( 45 content::ProfilerControllerImpl::GetInstance()->OnProfilerDataCollected(
45 sequence_number, dictionary_value); 46 sequence_number, dictionary_value);
46 } 47 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698