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

Side by Side Diff: chrome/browser/media/webrtc_logging_handler_host.cc

Issue 1162973005: Stop including ip_address_number.h from net_util.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove some header sorting changes, seems to be breaking windows Created 5 years, 6 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/webrtc_logging_handler_host.h" 5 #include "chrome/browser/media/webrtc_logging_handler_host.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 14 matching lines...) Expand all
25 #include "chrome/common/chrome_switches.h" 25 #include "chrome/common/chrome_switches.h"
26 #include "chrome/common/chrome_version_info.h" 26 #include "chrome/common/chrome_version_info.h"
27 #include "chrome/common/media/webrtc_logging_messages.h" 27 #include "chrome/common/media/webrtc_logging_messages.h"
28 #include "chromeos/settings/cros_settings_names.h" 28 #include "chromeos/settings/cros_settings_names.h"
29 #include "content/public/browser/browser_thread.h" 29 #include "content/public/browser/browser_thread.h"
30 #include "content/public/browser/content_browser_client.h" 30 #include "content/public/browser/content_browser_client.h"
31 #include "content/public/browser/gpu_data_manager.h" 31 #include "content/public/browser/gpu_data_manager.h"
32 #include "content/public/browser/render_process_host.h" 32 #include "content/public/browser/render_process_host.h"
33 #include "gpu/config/gpu_info.h" 33 #include "gpu/config/gpu_info.h"
34 #include "net/base/address_family.h" 34 #include "net/base/address_family.h"
35 #include "net/base/ip_address_number.h"
35 #include "net/url_request/url_request_context_getter.h" 36 #include "net/url_request/url_request_context_getter.h"
36 37
37 #if defined(OS_LINUX) 38 #if defined(OS_LINUX)
38 #include "base/linux_util.h" 39 #include "base/linux_util.h"
39 #endif 40 #endif
40 41
41 #if defined(OS_MACOSX) 42 #if defined(OS_MACOSX)
42 #include "base/mac/mac_util.h" 43 #include "base/mac/mac_util.h"
43 #endif 44 #endif
44 45
(...skipping 717 matching lines...) Expand 10 before | Expand all | Expand 10 after
762 WebRtcRtpDumpHandler::ReleasedDumps rtp_dumps( 763 WebRtcRtpDumpHandler::ReleasedDumps rtp_dumps(
763 rtp_dump_handler_->ReleaseDumps()); 764 rtp_dump_handler_->ReleaseDumps());
764 log_paths->incoming_rtp_dump = rtp_dumps.incoming_dump_path; 765 log_paths->incoming_rtp_dump = rtp_dumps.incoming_dump_path;
765 log_paths->outgoing_rtp_dump = rtp_dumps.outgoing_dump_path; 766 log_paths->outgoing_rtp_dump = rtp_dumps.outgoing_dump_path;
766 767
767 rtp_dump_handler_.reset(); 768 rtp_dump_handler_.reset();
768 stop_rtp_dump_callback_.Reset(); 769 stop_rtp_dump_callback_.Reset();
769 770
770 return true; 771 return true;
771 } 772 }
OLDNEW
« no previous file with comments | « chrome/browser/local_discovery/service_discovery_client_mac.mm ('k') | chrome/browser/safe_browsing/safe_browsing_database.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698