webkit/media/buffered_resource_loader.cc - Issue 11887029: Update some #includes in webkit/media for headers in the new Platform directory

Side by Side Diff: webkit/media/buffered_resource_loader.cc

Issue 11887029: Update some #includes in webkit/media for headers in the new Platform directory (Closed) Base URL: http://src.chromium.org/svn/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

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 "webkit/media/buffered_resource_loader.h"	5 #include "webkit/media/buffered_resource_loader.h"

6	6

7 #include "base/bits.h"	7 #include "base/bits.h"

8 #include "base/callback_helpers.h"	8 #include "base/callback_helpers.h"

9 #include "base/format_macros.h"	9 #include "base/format_macros.h"

10 #include "base/metrics/histogram.h"	10 #include "base/metrics/histogram.h"

11 #include "base/string_number_conversions.h"	11 #include "base/string_number_conversions.h"

12 #include "base/string_util.h"	12 #include "base/string_util.h"

13 #include "base/stringprintf.h"	13 #include "base/stringprintf.h"

14 #include "media/base/media_log.h"	14 #include "media/base/media_log.h"

15 #include "net/http/http_request_headers.h"	15 #include "net/http/http_request_headers.h"

16 #include "webkit/media/cache_util.h"	16 #include "third_party/WebKit/Source/Platform/chromium/public/WebString.h"

	17 #include "third_party/WebKit/Source/Platform/chromium/public/WebURLError.h"

	18 #include "third_party/WebKit/Source/Platform/chromium/public/WebURLResponse.h"

17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"	19 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"

18 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLLoaderOptions.h "	20 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLLoaderOptions.h "

19 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebKitPlatfo rmSupport.h"	21 #include "webkit/media/cache_util.h"

20 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"

21 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError. h"

22 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLRespon se.h"

23	22

24 using WebKit::WebFrame;	23 using WebKit::WebFrame;

25 using WebKit::WebString;	24 using WebKit::WebString;

26 using WebKit::WebURLError;	25 using WebKit::WebURLError;

27 using WebKit::WebURLLoader;	26 using WebKit::WebURLLoader;

28 using WebKit::WebURLLoaderOptions;	27 using WebKit::WebURLLoaderOptions;

29 using WebKit::WebURLRequest;	28 using WebKit::WebURLRequest;

30 using WebKit::WebURLResponse;	29 using WebKit::WebURLResponse;

31	30

32 namespace webkit_media {	31 namespace webkit_media {

(...skipping 762 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
795	794

796 void BufferedResourceLoader::Log() {	795 void BufferedResourceLoader::Log() {

797 media_log_->AddEvent(	796 media_log_->AddEvent(

798 media_log_->CreateBufferedExtentsChangedEvent(	797 media_log_->CreateBufferedExtentsChangedEvent(

799 offset_ - buffer_.backward_bytes(),	798 offset_ - buffer_.backward_bytes(),

800 offset_,	799 offset_,

801 offset_ + buffer_.forward_bytes()));	800 offset_ + buffer_.forward_bytes()));

802 }	801 }

803	802

804 } // namespace webkit_media	803 } // namespace webkit_media

OLD	NEW

« no previous file with comments | « webkit/media/buffered_resource_loader.h ('k') | webkit/media/buffered_resource_loader_unittest.cc » ('j') | no next file with comments »