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

Side by Side Diff: chrome/browser/media_transfer_protocol/media_transfer_protocol_manager.cc

Issue 11722025: Revert 175073 because it fails to compile on Linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 11 months 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
Property Changes:
Added: svn:mergeinfo
OLDNEW
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 "chrome/browser/media_transfer_protocol/media_transfer_protocol_manager .h" 5 #include "chrome/browser/media_transfer_protocol/media_transfer_protocol_manager .h"
6 6
7 #include <map> 7 #include <map>
8 #include <queue> 8 #include <queue>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 g_media_transfer_protocol_manager = NULL; 444 g_media_transfer_protocol_manager = NULL;
445 VLOG(1) << "MediaTransferProtocolManager Shutdown completed"; 445 VLOG(1) << "MediaTransferProtocolManager Shutdown completed";
446 } 446 }
447 447
448 // static 448 // static
449 MediaTransferProtocolManager* MediaTransferProtocolManager::GetInstance() { 449 MediaTransferProtocolManager* MediaTransferProtocolManager::GetInstance() {
450 return g_media_transfer_protocol_manager; 450 return g_media_transfer_protocol_manager;
451 } 451 }
452 452
453 } // namespace chrome 453 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698