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

Side by Side Diff: chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc

Issue 11418102: Linux: fix header includes for system protobuf. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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
« no previous file with comments | « chrome/browser/history/url_index_private_data.cc ('k') | dbus/message.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/renderer_host/chrome_resource_dispatcher_host_delegate. h" 5 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate. h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/base64.h" 9 #include "base/base64.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 25 matching lines...) Expand all
36 #include "content/public/browser/browser_thread.h" 36 #include "content/public/browser/browser_thread.h"
37 #include "content/public/browser/notification_service.h" 37 #include "content/public/browser/notification_service.h"
38 #include "content/public/browser/render_view_host.h" 38 #include "content/public/browser/render_view_host.h"
39 #include "content/public/browser/resource_context.h" 39 #include "content/public/browser/resource_context.h"
40 #include "content/public/browser/resource_dispatcher_host.h" 40 #include "content/public/browser/resource_dispatcher_host.h"
41 #include "content/public/browser/resource_request_info.h" 41 #include "content/public/browser/resource_request_info.h"
42 #include "net/base/load_flags.h" 42 #include "net/base/load_flags.h"
43 #include "net/base/ssl_config_service.h" 43 #include "net/base/ssl_config_service.h"
44 #include "net/http/http_response_headers.h" 44 #include "net/http/http_response_headers.h"
45 #include "net/url_request/url_request.h" 45 #include "net/url_request/url_request.h"
46
47 #if defined(USE_SYSTEM_PROTOBUF)
48 #include <google/protobuf/repeated_field.h>
49 #else
46 #include "third_party/protobuf/src/google/protobuf/repeated_field.h" 50 #include "third_party/protobuf/src/google/protobuf/repeated_field.h"
51 #endif
47 52
48 #if defined(OS_ANDROID) 53 #if defined(OS_ANDROID)
49 #include "content/components/navigation_interception/intercept_navigation_delega te.h" 54 #include "content/components/navigation_interception/intercept_navigation_delega te.h"
50 #endif 55 #endif
51 56
52 // TODO(oshima): Enable this for other platforms. 57 // TODO(oshima): Enable this for other platforms.
53 #if defined(OS_CHROMEOS) 58 #if defined(OS_CHROMEOS)
54 #include "chrome/browser/renderer_host/offline_resource_throttle.h" 59 #include "chrome/browser/renderer_host/offline_resource_throttle.h"
55 #endif 60 #endif
56 61
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 if (base::Base64Encode(serialized, &hashed)) { 514 if (base::Base64Encode(serialized, &hashed)) {
510 // If successful, swap the header value with the new one. 515 // If successful, swap the header value with the new one.
511 // Note that the list of IDs and the header could be temporarily out of sync 516 // Note that the list of IDs and the header could be temporarily out of sync
512 // if IDs are added as the header is recreated. The receiving servers are OK 517 // if IDs are added as the header is recreated. The receiving servers are OK
513 // with such descrepancies. 518 // with such descrepancies.
514 variation_ids_header_ = hashed; 519 variation_ids_header_ = hashed;
515 } else { 520 } else {
516 DVLOG(1) << "Failed to base64 encode Variation IDs value: " << serialized; 521 DVLOG(1) << "Failed to base64 encode Variation IDs value: " << serialized;
517 } 522 }
518 } 523 }
OLDNEW
« no previous file with comments | « chrome/browser/history/url_index_private_data.cc ('k') | dbus/message.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698