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

Side by Side Diff: chrome/utility/importer/safari_importer.mm

Issue 635623003: Cleanup: Better constify some strings in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix mac Created 6 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
« no previous file with comments | « chrome/utility/importer/nss_decryptor.cc ('k') | chrome/utility/web_resource_unpacker.h » ('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 <Cocoa/Cocoa.h> 5 #include <Cocoa/Cocoa.h>
6 6
7 #include "chrome/utility/importer/safari_importer.h" 7 #include "chrome/utility/importer/safari_importer.h"
8 8
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 stringByAppendingPathComponent:@"Safari"]; 113 stringByAppendingPathComponent:@"Safari"];
114 NSString* favicons_db_path = [safari_dir 114 NSString* favicons_db_path = [safari_dir
115 stringByAppendingPathComponent:@"WebpageIcons.db"]; 115 stringByAppendingPathComponent:@"WebpageIcons.db"];
116 116
117 const char* db_path = [favicons_db_path fileSystemRepresentation]; 117 const char* db_path = [favicons_db_path fileSystemRepresentation];
118 return db->Open(base::FilePath(db_path)); 118 return db->Open(base::FilePath(db_path));
119 } 119 }
120 120
121 void SafariImporter::ImportFaviconURLs(sql::Connection* db, 121 void SafariImporter::ImportFaviconURLs(sql::Connection* db,
122 FaviconMap* favicon_map) { 122 FaviconMap* favicon_map) {
123 const char* query = "SELECT iconID, url FROM PageURL;"; 123 const char query[] = "SELECT iconID, url FROM PageURL;";
124 sql::Statement s(db->GetUniqueStatement(query)); 124 sql::Statement s(db->GetUniqueStatement(query));
125 125
126 while (s.Step() && !cancelled()) { 126 while (s.Step() && !cancelled()) {
127 int64 icon_id = s.ColumnInt64(0); 127 int64 icon_id = s.ColumnInt64(0);
128 GURL url = GURL(s.ColumnString(1)); 128 GURL url = GURL(s.ColumnString(1));
129 (*favicon_map)[icon_id].insert(url); 129 (*favicon_map)[icon_id].insert(url);
130 } 130 }
131 } 131 }
132 132
133 void SafariImporter::LoadFaviconData( 133 void SafariImporter::LoadFaviconData(
134 sql::Connection* db, 134 sql::Connection* db,
135 const FaviconMap& favicon_map, 135 const FaviconMap& favicon_map,
136 std::vector<ImportedFaviconUsage>* favicons) { 136 std::vector<ImportedFaviconUsage>* favicons) {
137 const char* query = "SELECT i.url, d.data " 137 const char query[] = "SELECT i.url, d.data "
138 "FROM IconInfo i JOIN IconData d " 138 "FROM IconInfo i JOIN IconData d "
139 "ON i.iconID = d.iconID " 139 "ON i.iconID = d.iconID "
140 "WHERE i.iconID = ?;"; 140 "WHERE i.iconID = ?;";
141 sql::Statement s(db->GetUniqueStatement(query)); 141 sql::Statement s(db->GetUniqueStatement(query));
142 142
143 for (FaviconMap::const_iterator i = favicon_map.begin(); 143 for (FaviconMap::const_iterator i = favicon_map.begin();
144 i != favicon_map.end(); ++i) { 144 i != favicon_map.end(); ++i) {
145 s.Reset(true); 145 s.Reset(true);
146 s.BindInt64(0, i->first); 146 s.BindInt64(0, i->first);
147 if (s.Step()) { 147 if (s.Step()) {
148 ImportedFaviconUsage usage; 148 ImportedFaviconUsage usage;
149 149
150 usage.favicon_url = GURL(s.ColumnString(0)); 150 usage.favicon_url = GURL(s.ColumnString(0));
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 if (!last_visit_str) 373 if (!last_visit_str)
374 continue; 374 continue;
375 375
376 // Convert Safari's last visit time to Unix Epoch time. 376 // Convert Safari's last visit time to Unix Epoch time.
377 double seconds_since_unix_epoch = HistoryTimeToEpochTime(last_visit_str); 377 double seconds_since_unix_epoch = HistoryTimeToEpochTime(last_visit_str);
378 row.last_visit = base::Time::FromDoubleT(seconds_since_unix_epoch); 378 row.last_visit = base::Time::FromDoubleT(seconds_since_unix_epoch);
379 379
380 history_items->push_back(row); 380 history_items->push_back(row);
381 } 381 }
382 } 382 }
OLDNEW
« no previous file with comments | « chrome/utility/importer/nss_decryptor.cc ('k') | chrome/utility/web_resource_unpacker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698