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

Side by Side Diff: chrome/browser/history/url_index_private_data.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 | « no previous file | chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.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/history/url_index_private_data.h" 5 #include "chrome/browser/history/url_index_private_data.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <functional> 8 #include <functional>
9 #include <iterator> 9 #include <iterator>
10 #include <limits> 10 #include <limits>
(...skipping 10 matching lines...) Expand all
21 #include "chrome/browser/api/bookmarks/bookmark_service.h" 21 #include "chrome/browser/api/bookmarks/bookmark_service.h"
22 #include "chrome/browser/autocomplete/autocomplete_provider.h" 22 #include "chrome/browser/autocomplete/autocomplete_provider.h"
23 #include "chrome/browser/autocomplete/url_prefix.h" 23 #include "chrome/browser/autocomplete/url_prefix.h"
24 #include "chrome/browser/history/history_database.h" 24 #include "chrome/browser/history/history_database.h"
25 #include "chrome/browser/history/in_memory_url_index.h" 25 #include "chrome/browser/history/in_memory_url_index.h"
26 #include "content/public/browser/browser_thread.h" 26 #include "content/public/browser/browser_thread.h"
27 #include "content/public/browser/notification_details.h" 27 #include "content/public/browser/notification_details.h"
28 #include "content/public/browser/notification_service.h" 28 #include "content/public/browser/notification_service.h"
29 #include "content/public/browser/notification_source.h" 29 #include "content/public/browser/notification_source.h"
30 #include "net/base/net_util.h" 30 #include "net/base/net_util.h"
31
32 #if defined(USE_SYSTEM_PROTOBUF)
33 #include <google/protobuf/repeated_field.h>
34 #else
31 #include "third_party/protobuf/src/google/protobuf/repeated_field.h" 35 #include "third_party/protobuf/src/google/protobuf/repeated_field.h"
36 #endif
32 37
33 using google::protobuf::RepeatedField; 38 using google::protobuf::RepeatedField;
34 using google::protobuf::RepeatedPtrField; 39 using google::protobuf::RepeatedPtrField;
35 using in_memory_url_index::InMemoryURLIndexCacheItem; 40 using in_memory_url_index::InMemoryURLIndexCacheItem;
36 41
37 namespace history { 42 namespace history {
38 43
39 typedef imui::InMemoryURLIndexCacheItem_WordListItem WordListItem; 44 typedef imui::InMemoryURLIndexCacheItem_WordListItem WordListItem;
40 typedef imui::InMemoryURLIndexCacheItem_WordMapItem_WordMapEntry WordMapEntry; 45 typedef imui::InMemoryURLIndexCacheItem_WordMapItem_WordMapEntry WordMapEntry;
41 typedef imui::InMemoryURLIndexCacheItem_WordMapItem WordMapItem; 46 typedef imui::InMemoryURLIndexCacheItem_WordMapItem WordMapItem;
(...skipping 1106 matching lines...) Expand 10 before | Expand all | Expand 10 after
1148 } 1153 }
1149 1154
1150 // static 1155 // static
1151 bool URLIndexPrivateData::URLSchemeIsWhitelisted( 1156 bool URLIndexPrivateData::URLSchemeIsWhitelisted(
1152 const GURL& gurl, 1157 const GURL& gurl,
1153 const std::set<std::string>& whitelist) { 1158 const std::set<std::string>& whitelist) {
1154 return whitelist.find(gurl.scheme()) != whitelist.end(); 1159 return whitelist.find(gurl.scheme()) != whitelist.end();
1155 } 1160 }
1156 1161
1157 } // namespace history 1162 } // namespace history
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698