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

Side by Side Diff: chrome/browser/history/in_memory_url_index.cc

Issue 7811006: Add full support for filesystem URLs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Better content_settings_pattern.cc changes. Created 9 years 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/in_memory_url_index.h" 5 #include "chrome/browser/history/in_memory_url_index.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 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 DCHECK(history_dir_.empty() || cached_at_shutdown_); 132 DCHECK(history_dir_.empty() || cached_at_shutdown_);
133 } 133 }
134 134
135 // static 135 // static
136 void InMemoryURLIndex::InitializeSchemeWhitelist( 136 void InMemoryURLIndex::InitializeSchemeWhitelist(
137 std::set<std::string>* whitelist) { 137 std::set<std::string>* whitelist) {
138 DCHECK(whitelist); 138 DCHECK(whitelist);
139 whitelist->insert(std::string(chrome::kAboutScheme)); 139 whitelist->insert(std::string(chrome::kAboutScheme));
140 whitelist->insert(std::string(chrome::kChromeUIScheme)); 140 whitelist->insert(std::string(chrome::kChromeUIScheme));
141 whitelist->insert(std::string(chrome::kFileScheme)); 141 whitelist->insert(std::string(chrome::kFileScheme));
142 whitelist->insert(std::string(chrome::kFileSystemScheme));
142 whitelist->insert(std::string(chrome::kFtpScheme)); 143 whitelist->insert(std::string(chrome::kFtpScheme));
143 whitelist->insert(std::string(chrome::kHttpScheme)); 144 whitelist->insert(std::string(chrome::kHttpScheme));
144 whitelist->insert(std::string(chrome::kHttpsScheme)); 145 whitelist->insert(std::string(chrome::kHttpsScheme));
145 whitelist->insert(std::string(chrome::kMailToScheme)); 146 whitelist->insert(std::string(chrome::kMailToScheme));
146 } 147 }
147 148
148 // Indexing 149 // Indexing
149 150
150 bool InMemoryURLIndex::Init(URLDatabase* history_db, 151 bool InMemoryURLIndex::Init(URLDatabase* history_db,
151 const std::string& languages) { 152 const std::string& languages) {
(...skipping 982 matching lines...) Expand 10 before | Expand all | Expand 10 after
1134 if (iter->has_title()) { 1135 if (iter->has_title()) {
1135 string16 title(UTF8ToUTF16(iter->title())); 1136 string16 title(UTF8ToUTF16(iter->title()));
1136 url_row.set_title(title); 1137 url_row.set_title(title);
1137 } 1138 }
1138 private_data_->history_info_map_[history_id] = url_row; 1139 private_data_->history_info_map_[history_id] = url_row;
1139 } 1140 }
1140 return true; 1141 return true;
1141 } 1142 }
1142 1143
1143 } // namespace history 1144 } // namespace history
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698