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

Side by Side Diff: chrome/browser/prerender/prerender_contents.cc

Issue 370833002: Move resource_type.* from webkit/ to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chromeos fix Created 6 years, 5 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
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/prerender/prerender_contents.h" 5 #include "chrome/browser/prerender/prerender_contents.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <functional> 8 #include <functional>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 29 matching lines...) Expand all
40 #include "content/public/common/frame_navigate_params.h" 40 #include "content/public/common/frame_navigate_params.h"
41 #include "content/public/common/page_transition_types.h" 41 #include "content/public/common/page_transition_types.h"
42 #include "net/url_request/url_request_context_getter.h" 42 #include "net/url_request/url_request_context_getter.h"
43 #include "ui/gfx/rect.h" 43 #include "ui/gfx/rect.h"
44 44
45 using content::BrowserThread; 45 using content::BrowserThread;
46 using content::DownloadItem; 46 using content::DownloadItem;
47 using content::OpenURLParams; 47 using content::OpenURLParams;
48 using content::RenderViewHost; 48 using content::RenderViewHost;
49 using content::ResourceRedirectDetails; 49 using content::ResourceRedirectDetails;
50 using content::ResourceType;
50 using content::SessionStorageNamespace; 51 using content::SessionStorageNamespace;
51 using content::WebContents; 52 using content::WebContents;
52 53
53 namespace prerender { 54 namespace prerender {
54 55
55 namespace { 56 namespace {
56 57
57 // Internal cookie event. 58 // Internal cookie event.
58 // Whenever a prerender interacts with the cookie store, either sending 59 // Whenever a prerender interacts with the cookie store, either sending
59 // existing cookies that existed before the prerender started, or when a cookie 60 // existing cookies that existed before the prerender started, or when a cookie
(...skipping 837 matching lines...) Expand 10 before | Expand all | Expand 10 after
897 void PrerenderContents::AddResourceThrottle( 898 void PrerenderContents::AddResourceThrottle(
898 const base::WeakPtr<PrerenderResourceThrottle>& throttle) { 899 const base::WeakPtr<PrerenderResourceThrottle>& throttle) {
899 resource_throttles_.push_back(throttle); 900 resource_throttles_.push_back(throttle);
900 } 901 }
901 902
902 void PrerenderContents::AddNetworkBytes(int64 bytes) { 903 void PrerenderContents::AddNetworkBytes(int64 bytes) {
903 network_bytes_ += bytes; 904 network_bytes_ += bytes;
904 } 905 }
905 906
906 } // namespace prerender 907 } // namespace prerender
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698