diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-04 09:46:51 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-04 09:46:51 +0000 |
commit | be7b41e8ba4e2629a5ad62cacb1d5983e0797e4c (patch) | |
tree | 0d62275a8d7603ea512f9b3a5d25e78dc6b0c525 /content/common/resource_dispatcher.h | |
parent | 60f59cdcb8eec9a21b6a07ded9390da3f7f9d5c7 (diff) | |
download | chromium_src-be7b41e8ba4e2629a5ad62cacb1d5983e0797e4c.zip chromium_src-be7b41e8ba4e2629a5ad62cacb1d5983e0797e4c.tar.gz chromium_src-be7b41e8ba4e2629a5ad62cacb1d5983e0797e4c.tar.bz2 |
content/common/ shouldn't extend the webkit_glue namespace. Move contents of resource_dispatcher.{h,cc} into the content namespace.
R=jam@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10690069
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145448 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/resource_dispatcher.h')
-rw-r--r-- | content/common/resource_dispatcher.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/content/common/resource_dispatcher.h b/content/common/resource_dispatcher.h index 363fb78..ba12524 100644 --- a/content/common/resource_dispatcher.h +++ b/content/common/resource_dispatcher.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -24,7 +24,6 @@ namespace content { class ResourceDispatcherDelegate; struct ResourceResponseHead; -} // This class serves as a communication interface between the // ResourceDispatcherHost in the browser process and the ResourceLoaderBridge in @@ -65,7 +64,7 @@ class CONTENT_EXPORT ResourceDispatcher : public IPC::Listener { // This does not take ownership of the delegate. It is expected that the // delegate have a longer lifetime than the ResourceDispatcher. - void set_delegate(content::ResourceDispatcherDelegate* delegate) { + void set_delegate(ResourceDispatcherDelegate* delegate) { delegate_ = delegate; } @@ -110,13 +109,13 @@ class CONTENT_EXPORT ResourceDispatcher : public IPC::Listener { int request_id, int64 position, int64 size); - void OnReceivedResponse(int request_id, const content::ResourceResponseHead&); + void OnReceivedResponse(int request_id, const ResourceResponseHead&); void OnReceivedCachedMetadata(int request_id, const std::vector<char>& data); void OnReceivedRedirect( const IPC::Message& message, int request_id, const GURL& new_url, - const content::ResourceResponseHead& response_head); + const ResourceResponseHead& response_head); void OnReceivedData( const IPC::Message& message, int request_id, @@ -142,7 +141,7 @@ class CONTENT_EXPORT ResourceDispatcher : public IPC::Listener { void ToResourceResponseInfo( const PendingRequestInfo& request_info, - const content::ResourceResponseHead& browser_info, + const ResourceResponseHead& browser_info, webkit_glue::ResourceResponseInfo* renderer_info) const; base::TimeTicks ToRendererCompletionTime( @@ -170,9 +169,11 @@ class CONTENT_EXPORT ResourceDispatcher : public IPC::Listener { base::WeakPtrFactory<ResourceDispatcher> weak_factory_; - content::ResourceDispatcherDelegate* delegate_; + ResourceDispatcherDelegate* delegate_; DISALLOW_COPY_AND_ASSIGN(ResourceDispatcher); }; +} // namespace content + #endif // CONTENT_COMMON_RESOURCE_DISPATCHER_H_ |