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

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

Issue 7744055: bookmarks: Fix an obvious typo in IDS_BOOMARK_*. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 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) 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 <Cocoa/Cocoa.h> 5 #include <Cocoa/Cocoa.h>
6 6
7 #include "chrome/browser/importer/safari_importer.h" 7 #include "chrome/browser/importer/safari_importer.h"
8 8
9 #include <map> 9 #include <map>
10 #include <vector> 10 #include <vector>
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 if ((items & importer::PASSWORDS) && !cancelled()) { 92 if ((items & importer::PASSWORDS) && !cancelled()) {
93 bridge_->NotifyItemStarted(importer::PASSWORDS); 93 bridge_->NotifyItemStarted(importer::PASSWORDS);
94 ImportPasswords(); 94 ImportPasswords();
95 bridge_->NotifyItemEnded(importer::PASSWORDS); 95 bridge_->NotifyItemEnded(importer::PASSWORDS);
96 } 96 }
97 bridge_->NotifyEnded(); 97 bridge_->NotifyEnded();
98 } 98 }
99 99
100 void SafariImporter::ImportBookmarks() { 100 void SafariImporter::ImportBookmarks() {
101 string16 toolbar_name = 101 string16 toolbar_name =
102 bridge_->GetLocalizedString(IDS_BOOMARK_BAR_FOLDER_NAME); 102 bridge_->GetLocalizedString(IDS_BOOKMARK_BAR_FOLDER_NAME);
103 std::vector<ProfileWriter::BookmarkEntry> bookmarks; 103 std::vector<ProfileWriter::BookmarkEntry> bookmarks;
104 ParseBookmarks(toolbar_name, &bookmarks); 104 ParseBookmarks(toolbar_name, &bookmarks);
105 105
106 // Write bookmarks into profile. 106 // Write bookmarks into profile.
107 if (!bookmarks.empty() && !cancelled()) { 107 if (!bookmarks.empty() && !cancelled()) {
108 const string16& first_folder_name = 108 const string16& first_folder_name =
109 bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_SAFARI); 109 bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_SAFARI);
110 bridge_->AddBookmarks(bookmarks, first_folder_name); 110 bridge_->AddBookmarks(bookmarks, first_folder_name);
111 } 111 }
112 112
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 if (!last_visit_str) 394 if (!last_visit_str)
395 continue; 395 continue;
396 396
397 // Convert Safari's last visit time to Unix Epoch time. 397 // Convert Safari's last visit time to Unix Epoch time.
398 double seconds_since_unix_epoch = HistoryTimeToEpochTime(last_visit_str); 398 double seconds_since_unix_epoch = HistoryTimeToEpochTime(last_visit_str);
399 row.set_last_visit(base::Time::FromDoubleT(seconds_since_unix_epoch)); 399 row.set_last_visit(base::Time::FromDoubleT(seconds_since_unix_epoch));
400 400
401 history_items->push_back(row); 401 history_items->push_back(row);
402 } 402 }
403 } 403 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698