OLD | NEW |
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/importer/toolbar_importer.h" | 5 #include "chrome/browser/importer/toolbar_importer.h" |
6 | 6 |
7 #include <limits> | 7 #include <limits> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/rand_util.h" | 10 #include "base/rand_util.h" |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
95 // thread for synchronization. | 95 // thread for synchronization. |
96 if (BrowserThread::CurrentlyOn(BrowserThread::UI)) { | 96 if (BrowserThread::CurrentlyOn(BrowserThread::UI)) { |
97 EndImport(); | 97 EndImport(); |
98 } else { | 98 } else { |
99 BrowserThread::PostTask( | 99 BrowserThread::PostTask( |
100 BrowserThread::UI, FROM_HERE, | 100 BrowserThread::UI, FROM_HERE, |
101 base::Bind(&Toolbar5Importer::Cancel, this)); | 101 base::Bind(&Toolbar5Importer::Cancel, this)); |
102 } | 102 } |
103 } | 103 } |
104 | 104 |
105 void Toolbar5Importer::OnURLFetchComplete(const content::URLFetcher* source) { | 105 void Toolbar5Importer::OnURLFetchComplete(const net::URLFetcher* source) { |
106 if (cancelled()) { | 106 if (cancelled()) { |
107 EndImport(); | 107 EndImport(); |
108 return; | 108 return; |
109 } | 109 } |
110 | 110 |
111 if (200 != source->GetResponseCode()) { // HTTP/Ok | 111 if (200 != source->GetResponseCode()) { // HTTP/Ok |
112 // Cancelling here will update the UI and bypass the rest of bookmark | 112 // Cancelling here will update the UI and bypass the rest of bookmark |
113 // import. | 113 // import. |
114 EndImportBookmarks(); | 114 EndImportBookmarks(); |
115 return; | 115 return; |
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
563 } | 563 } |
564 | 564 |
565 void Toolbar5Importer::AddBookmarksToChrome( | 565 void Toolbar5Importer::AddBookmarksToChrome( |
566 const std::vector<ProfileWriter::BookmarkEntry>& bookmarks) { | 566 const std::vector<ProfileWriter::BookmarkEntry>& bookmarks) { |
567 if (!bookmarks.empty() && !cancelled()) { | 567 if (!bookmarks.empty() && !cancelled()) { |
568 const string16& first_folder_name = | 568 const string16& first_folder_name = |
569 bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_GOOGLE_TOOLBAR); | 569 bridge_->GetLocalizedString(IDS_BOOKMARK_GROUP_FROM_GOOGLE_TOOLBAR); |
570 bridge_->AddBookmarks(bookmarks, first_folder_name); | 570 bridge_->AddBookmarks(bookmarks, first_folder_name); |
571 } | 571 } |
572 } | 572 } |
OLD | NEW |