| OLD | NEW |
| 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/media/media_internals.h" | 5 #include "content/browser/media/media_internals.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <utility> |
| 8 | 9 |
| 9 #include "base/macros.h" | 10 #include "base/macros.h" |
| 10 #include "base/metrics/histogram.h" | 11 #include "base/metrics/histogram.h" |
| 11 #include "base/strings/string16.h" | 12 #include "base/strings/string16.h" |
| 12 #include "base/strings/string_number_conversions.h" | 13 #include "base/strings/string_number_conversions.h" |
| 13 #include "base/strings/stringprintf.h" | 14 #include "base/strings/stringprintf.h" |
| 14 #include "build/build_config.h" | 15 #include "build/build_config.h" |
| 15 #include "content/public/browser/browser_thread.h" | 16 #include "content/public/browser/browser_thread.h" |
| 16 #include "content/public/browser/notification_service.h" | 17 #include "content/public/browser/notification_service.h" |
| 17 #include "content/public/browser/notification_types.h" | 18 #include "content/public/browser/notification_types.h" |
| (...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 media_internals_->UpdateAudioLog(MediaInternals::UPDATE_IF_EXISTS, | 203 media_internals_->UpdateAudioLog(MediaInternals::UPDATE_IF_EXISTS, |
| 203 FormatCacheKey(component_id), | 204 FormatCacheKey(component_id), |
| 204 kAudioLogUpdateFunction, &dict); | 205 kAudioLogUpdateFunction, &dict); |
| 205 } | 206 } |
| 206 | 207 |
| 207 void AudioLogImpl::SendWebContentsTitle(int component_id, | 208 void AudioLogImpl::SendWebContentsTitle(int component_id, |
| 208 int render_process_id, | 209 int render_process_id, |
| 209 int render_frame_id) { | 210 int render_frame_id) { |
| 210 scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); | 211 scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); |
| 211 StoreComponentMetadata(component_id, dict.get()); | 212 StoreComponentMetadata(component_id, dict.get()); |
| 212 SendWebContentsTitleHelper(FormatCacheKey(component_id), dict.Pass(), | 213 SendWebContentsTitleHelper(FormatCacheKey(component_id), std::move(dict), |
| 213 render_process_id, render_frame_id); | 214 render_process_id, render_frame_id); |
| 214 } | 215 } |
| 215 | 216 |
| 216 std::string AudioLogImpl::FormatCacheKey(int component_id) { | 217 std::string AudioLogImpl::FormatCacheKey(int component_id) { |
| 217 return base::StringPrintf("%d:%d:%d", owner_id_, component_, component_id); | 218 return base::StringPrintf("%d:%d:%d", owner_id_, component_, component_id); |
| 218 } | 219 } |
| 219 | 220 |
| 220 // static | 221 // static |
| 221 void AudioLogImpl::SendWebContentsTitleHelper( | 222 void AudioLogImpl::SendWebContentsTitleHelper( |
| 222 const std::string& cache_key, | 223 const std::string& cache_key, |
| (...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 682 audio_streams_cached_data_.GetDictionary(cache_key, &existing_dict)); | 683 audio_streams_cached_data_.GetDictionary(cache_key, &existing_dict)); |
| 683 existing_dict->MergeDictionary(value); | 684 existing_dict->MergeDictionary(value); |
| 684 } | 685 } |
| 685 } | 686 } |
| 686 | 687 |
| 687 if (CanUpdate()) | 688 if (CanUpdate()) |
| 688 SendUpdate(SerializeUpdate(function, value)); | 689 SendUpdate(SerializeUpdate(function, value)); |
| 689 } | 690 } |
| 690 | 691 |
| 691 } // namespace content | 692 } // namespace content |
| OLD | NEW |