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

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

Issue 24345002: Do not add "Bookmarks File" to ImporterList. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 2 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
« no previous file with comments | « no previous file | chrome/browser/first_run/first_run_browsertest.cc » ('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 "chrome/browser/first_run/first_run.h" 5 #include "chrome/browser/first_run/first_run.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 707 matching lines...) Expand 10 before | Expand all | Expand 10 after
718 const std::string& import_bookmarks_path) { 718 const std::string& import_bookmarks_path) {
719 // Deletes itself. 719 // Deletes itself.
720 ExternalProcessImporterHost* importer_host = new ExternalProcessImporterHost; 720 ExternalProcessImporterHost* importer_host = new ExternalProcessImporterHost;
721 721
722 base::FilePath local_state_path; 722 base::FilePath local_state_path;
723 PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path); 723 PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path);
724 bool local_state_file_exists = base::PathExists(local_state_path); 724 bool local_state_file_exists = base::PathExists(local_state_path);
725 725
726 scoped_refptr<ImporterList> importer_list(new ImporterList()); 726 scoped_refptr<ImporterList> importer_list(new ImporterList());
727 importer_list->DetectSourceProfilesHack( 727 importer_list->DetectSourceProfilesHack(
728 g_browser_process->GetApplicationLocale()); 728 g_browser_process->GetApplicationLocale(), false);
729 729
730 // Do import if there is an available profile for us to import. 730 // Do import if there is an available profile for us to import.
731 if (importer_list->count() > 0) { 731 if (importer_list->count() > 0) {
732 // Don't show the warning dialog if import fails. 732 // Don't show the warning dialog if import fails.
733 importer_host->set_headless(); 733 importer_host->set_headless();
734 int items = 0; 734 int items = 0;
735 735
736 if (internal::IsOrganicFirstRun()) { 736 if (internal::IsOrganicFirstRun()) {
737 // Home page is imported in organic builds only unless turned off or 737 // Home page is imported in organic builds only unless turned off or
738 // defined in master_preferences. 738 // defined in master_preferences.
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
813 SetShouldDoPersonalDataManagerFirstRun(); 813 SetShouldDoPersonalDataManagerFirstRun();
814 814
815 internal::DoPostImportPlatformSpecificTasks(profile); 815 internal::DoPostImportPlatformSpecificTasks(profile);
816 } 816 }
817 817
818 uint16 auto_import_state() { 818 uint16 auto_import_state() {
819 return g_auto_import_state; 819 return g_auto_import_state;
820 } 820 }
821 821
822 } // namespace first_run 822 } // namespace first_run
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/first_run/first_run_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698