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

Side by Side Diff: chrome/browser/importer/importer.cc

Issue 159668: First cut at Safari Import - Home Page & History Only. (Closed)
Patch Set: Fix Stuart's comments. Created 11 years, 4 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
OLDNEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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/importer.h" 5 #include "chrome/browser/importer/importer.h"
6 6
7 #include <map> 7 #include <map>
8 #include <set> 8 #include <set>
9 9
10 #include "app/gfx/favicon_size.h" 10 #include "app/gfx/favicon_size.h"
11 #include "app/l10n_util.h" 11 #include "app/l10n_util.h"
12 #if defined(OS_WIN) 12 #if defined(OS_WIN)
13 #include "app/win_util.h" 13 #include "app/win_util.h"
14 #endif 14 #endif
15 #include "base/file_util.h" 15 #include "base/file_util.h"
16 #include "base/gfx/png_encoder.h" 16 #include "base/gfx/png_encoder.h"
17 #include "base/mac_util.h"
17 #include "base/message_loop.h" 18 #include "base/message_loop.h"
18 #include "base/string_util.h" 19 #include "base/string_util.h"
19 #include "chrome/browser/bookmarks/bookmark_model.h" 20 #include "chrome/browser/bookmarks/bookmark_model.h"
20 #include "chrome/browser/browser.h" 21 #include "chrome/browser/browser.h"
21 #include "chrome/browser/browser_list.h" 22 #include "chrome/browser/browser_list.h"
22 #include "chrome/browser/browser_process.h" 23 #include "chrome/browser/browser_process.h"
23 #include "chrome/browser/first_run.h" 24 #include "chrome/browser/first_run.h"
24 #include "chrome/browser/importer/firefox2_importer.h" 25 #include "chrome/browser/importer/firefox2_importer.h"
25 #include "chrome/browser/importer/firefox3_importer.h" 26 #include "chrome/browser/importer/firefox3_importer.h"
26 #include "chrome/browser/importer/firefox_importer_utils.h" 27 #include "chrome/browser/importer/firefox_importer_utils.h"
27 #include "chrome/browser/importer/firefox_profile_lock.h" 28 #include "chrome/browser/importer/firefox_profile_lock.h"
28 #if defined(OS_WIN) 29 #if defined(OS_WIN)
29 #include "chrome/browser/importer/ie_importer.h" 30 #include "chrome/browser/importer/ie_importer.h"
30 #endif 31 #endif
32 #if defined(OS_MACOSX)
33 #include "chrome/browser/importer/safari_importer.h"
34 #endif
31 #include "chrome/browser/importer/toolbar_importer.h" 35 #include "chrome/browser/importer/toolbar_importer.h"
32 #if defined(OS_WIN) 36 #if defined(OS_WIN)
33 #include "chrome/browser/password_manager/ie7_password.h" 37 #include "chrome/browser/password_manager/ie7_password.h"
34 #endif 38 #endif
35 #include "chrome/browser/renderer_host/site_instance.h" 39 #include "chrome/browser/renderer_host/site_instance.h"
36 #include "chrome/browser/search_engines/template_url_model.h" 40 #include "chrome/browser/search_engines/template_url_model.h"
37 #include "chrome/browser/shell_integration.h" 41 #include "chrome/browser/shell_integration.h"
38 #include "chrome/browser/webdata/web_data_service.h" 42 #include "chrome/browser/webdata/web_data_service.h"
39 #include "chrome/common/notification_service.h" 43 #include "chrome/common/notification_service.h"
40 #include "chrome/common/pref_names.h" 44 #include "chrome/common/pref_names.h"
(...skipping 604 matching lines...) Expand 10 before | Expand all | Expand 10 after
645 #endif 649 #endif
646 case BOOKMARKS_HTML: 650 case BOOKMARKS_HTML:
647 case FIREFOX2: 651 case FIREFOX2:
648 return new Firefox2Importer(); 652 return new Firefox2Importer();
649 case FIREFOX3: 653 case FIREFOX3:
650 return new Firefox3Importer(); 654 return new Firefox3Importer();
651 case GOOGLE_TOOLBAR5: 655 case GOOGLE_TOOLBAR5:
652 return new Toolbar5Importer(); 656 return new Toolbar5Importer();
653 #if defined(OS_MACOSX) 657 #if defined(OS_MACOSX)
654 case SAFARI: 658 case SAFARI:
655 // TODO(jeremy): Implement. 659 return new SafariImporter(mac_util::GetUserLibraryPath());
656 NOTIMPLEMENTED();
657 return NULL;
658 #endif // OS_MACOSX 660 #endif // OS_MACOSX
659 } 661 }
660 NOTREACHED(); 662 NOTREACHED();
661 return NULL; 663 return NULL;
662 } 664 }
663 665
664 int ImporterHost::GetAvailableProfileCount() { 666 int ImporterHost::GetAvailableProfileCount() {
665 return static_cast<int>(source_profiles_.size()); 667 return static_cast<int>(source_profiles_.size());
666 } 668 }
667 669
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
823 ProfileInfo* safari = new ProfileInfo(); 825 ProfileInfo* safari = new ProfileInfo();
824 safari->browser_type = SAFARI; 826 safari->browser_type = SAFARI;
825 safari->description = l10n_util::GetString(IDS_IMPORT_FROM_SAFARI); 827 safari->description = l10n_util::GetString(IDS_IMPORT_FROM_SAFARI);
826 safari->source_path.clear(); 828 safari->source_path.clear();
827 safari->app_path.clear(); 829 safari->app_path.clear();
828 safari->services_supported = HISTORY | FAVORITES | COOKIES | PASSWORDS | 830 safari->services_supported = HISTORY | FAVORITES | COOKIES | PASSWORDS |
829 SEARCH_ENGINES; 831 SEARCH_ENGINES;
830 source_profiles_.push_back(safari); 832 source_profiles_.push_back(safari);
831 } 833 }
832 #endif // OS_MACOSX 834 #endif // OS_MACOSX
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698