summaryrefslogtreecommitdiffstats
path: root/content/browser/media/webrtc_internals.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-14 17:58:00 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-14 17:58:00 +0000
commit716775259699430736d1a461131d2bc9982e1dc3 (patch)
tree825820a1778ba504a8319cae95b9b8d79a0742b5 /content/browser/media/webrtc_internals.cc
parent3eacfb1de4c166b7c5606ccc4e2943c80f75e16a (diff)
downloadchromium_src-716775259699430736d1a461131d2bc9982e1dc3.zip
chromium_src-716775259699430736d1a461131d2bc9982e1dc3.tar.gz
chromium_src-716775259699430736d1a461131d2bc9982e1dc3.tar.bz2
Make content use base namespace for Values.
This is in preparation for removing the "using". BUG= TBR=jam@chromium.org Review URL: https://codereview.chromium.org/17025003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206442 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/media/webrtc_internals.cc')
-rw-r--r--content/browser/media/webrtc_internals.cc34
1 files changed, 16 insertions, 18 deletions
diff --git a/content/browser/media/webrtc_internals.cc b/content/browser/media/webrtc_internals.cc
index efdba58..f8bcdc3 100644
--- a/content/browser/media/webrtc_internals.cc
+++ b/content/browser/media/webrtc_internals.cc
@@ -11,8 +11,6 @@
#include "content/public/browser/notification_types.h"
#include "content/public/browser/render_process_host.h"
-using base::DictionaryValue;
-using base::ListValue;
using base::ProcessId;
using std::string;
@@ -20,10 +18,10 @@ namespace content {
namespace {
// Makes sure that |dict| has a ListValue under path "log".
-static ListValue* EnsureLogList(DictionaryValue* dict) {
- ListValue* log = NULL;
+static base::ListValue* EnsureLogList(base::DictionaryValue* dict) {
+ base::ListValue* log = NULL;
if (!dict->GetList("log", &log)) {
- log = new ListValue();
+ log = new base::ListValue();
if (log)
dict->Set("log", log);
}
@@ -55,7 +53,7 @@ void WebRTCInternals::OnAddPeerConnection(int render_process_id,
const string& constraints) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- DictionaryValue* dict = new DictionaryValue();
+ base::DictionaryValue* dict = new base::DictionaryValue();
if (!dict)
return;
@@ -74,7 +72,7 @@ void WebRTCInternals::OnAddPeerConnection(int render_process_id,
void WebRTCInternals::OnRemovePeerConnection(ProcessId pid, int lid) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
for (size_t i = 0; i < peer_connection_data_.GetSize(); ++i) {
- DictionaryValue* dict = NULL;
+ base::DictionaryValue* dict = NULL;
peer_connection_data_.GetDictionary(i, &dict);
int this_pid = 0;
@@ -88,7 +86,7 @@ void WebRTCInternals::OnRemovePeerConnection(ProcessId pid, int lid) {
peer_connection_data_.Remove(i, NULL);
if (observers_.size() > 0) {
- DictionaryValue id;
+ base::DictionaryValue id;
id.SetInteger("pid", static_cast<int>(pid));
id.SetInteger("lid", lid);
SendUpdate("removePeerConnection", &id);
@@ -102,7 +100,7 @@ void WebRTCInternals::OnUpdatePeerConnection(
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
for (size_t i = 0; i < peer_connection_data_.GetSize(); ++i) {
- DictionaryValue* record = NULL;
+ base::DictionaryValue* record = NULL;
peer_connection_data_.GetDictionary(i, &record);
int this_pid = 0, this_lid = 0;
@@ -113,11 +111,11 @@ void WebRTCInternals::OnUpdatePeerConnection(
continue;
// Append the update to the end of the log.
- ListValue* log = EnsureLogList(record);
+ base::ListValue* log = EnsureLogList(record);
if (!log)
return;
- DictionaryValue* log_entry = new DictionaryValue();
+ base::DictionaryValue* log_entry = new base::DictionaryValue();
if (!log_entry)
return;
@@ -126,7 +124,7 @@ void WebRTCInternals::OnUpdatePeerConnection(
log->Append(log_entry);
if (observers_.size() > 0) {
- DictionaryValue update;
+ base::DictionaryValue update;
update.SetInteger("pid", static_cast<int>(pid));
update.SetInteger("lid", lid);
update.SetString("type", type);
@@ -143,11 +141,11 @@ void WebRTCInternals::OnAddStats(base::ProcessId pid, int lid,
if (observers_.size() == 0)
return;
- DictionaryValue dict;
+ base::DictionaryValue dict;
dict.SetInteger("pid", static_cast<int>(pid));
dict.SetInteger("lid", lid);
- ListValue* list = value.DeepCopy();
+ base::ListValue* list = value.DeepCopy();
if (!list)
return;
@@ -185,7 +183,7 @@ void WebRTCInternals::StopRtpRecording() {
}
}
-void WebRTCInternals::SendUpdate(const string& command, Value* value) {
+void WebRTCInternals::SendUpdate(const string& command, base::Value* value) {
DCHECK_GT(observers_.size(), (size_t)0);
FOR_EACH_OBSERVER(WebRTCInternalsUIObserver,
@@ -211,7 +209,7 @@ void WebRTCInternals::OnRendererExit(int render_process_id) {
// Iterates from the end of the list to remove the PeerConnections created
// by the exitting renderer.
for (int i = peer_connection_data_.GetSize() - 1; i >= 0; --i) {
- DictionaryValue* record = NULL;
+ base::DictionaryValue* record = NULL;
peer_connection_data_.GetDictionary(i, &record);
int this_rid = 0;
@@ -223,7 +221,7 @@ void WebRTCInternals::OnRendererExit(int render_process_id) {
record->GetInteger("lid", &lid);
record->GetInteger("pid", &pid);
- DictionaryValue update;
+ base::DictionaryValue update;
update.SetInteger("lid", lid);
update.SetInteger("pid", pid);
SendUpdate("removePeerConnection", &update);
@@ -237,7 +235,7 @@ void WebRTCInternals::OnRendererExit(int render_process_id) {
// UI.
void WebRTCInternals::SendRtpRecordingUpdate() {
DCHECK(is_recording_rtp_);
- DictionaryValue update;
+ base::DictionaryValue update;
// TODO(justinlin): Fill in |update| with values as appropriate.
SendUpdate("updateDumpStatus", &update);
}