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

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

Issue 14316007: Remove unused |first_run| parameter in ImporterHost::CheckForFirefoxLock() which results in a casca… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge up to r196136 Created 7 years, 8 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) 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 <windows.h> 7 #include <windows.h>
8 #include <shellapi.h> 8 #include <shellapi.h>
9 #include <shlobj.h> 9 #include <shlobj.h>
10 10
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 303
304 // If |skip_first_run_ui|, we run in headless mode. This means that if 304 // If |skip_first_run_ui|, we run in headless mode. This means that if
305 // there is user action required the import is automatically canceled. 305 // there is user action required the import is automatically canceled.
306 if (skip_first_run_ui) 306 if (skip_first_run_ui)
307 importer_host->set_headless(); 307 importer_host->set_headless();
308 308
309 first_run::internal::ImportEndedObserver observer; 309 first_run::internal::ImportEndedObserver observer;
310 importer_host->SetObserver(&observer); 310 importer_host->SetObserver(&observer);
311 importer_host->StartImportSettings( 311 importer_host->StartImportSettings(
312 importer_list->GetSourceProfileForImporterType(importer_type), profile, 312 importer_list->GetSourceProfileForImporterType(importer_type), profile,
313 static_cast<uint16>(items_to_import), new ProfileWriter(profile), true); 313 static_cast<uint16>(items_to_import), new ProfileWriter(profile));
314 // If the import process has not errored out, block on it. 314 // If the import process has not errored out, block on it.
315 if (!observer.ended()) { 315 if (!observer.ended()) {
316 observer.set_should_quit_message_loop(); 316 observer.set_should_quit_message_loop();
317 MessageLoop::current()->Run(); 317 MessageLoop::current()->Run();
318 } 318 }
319 // TODO(gab): This method will be go away as part of http://crbug.com/219419/, 319 // TODO(gab): This method will be go away as part of http://crbug.com/219419/,
320 // so it is fine to hardcode |RESULT_CODE_NORMAL_EXIT| here for now. 320 // so it is fine to hardcode |RESULT_CODE_NORMAL_EXIT| here for now.
321 return content::RESULT_CODE_NORMAL_EXIT; 321 return content::RESULT_CODE_NORMAL_EXIT;
322 } 322 }
323 #endif // !defined(USE_AURA) 323 #endif // !defined(USE_AURA)
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
514 514
515 base::FilePath MasterPrefsPath() { 515 base::FilePath MasterPrefsPath() {
516 // The standard location of the master prefs is next to the chrome binary. 516 // The standard location of the master prefs is next to the chrome binary.
517 base::FilePath master_prefs; 517 base::FilePath master_prefs;
518 if (!PathService::Get(base::DIR_EXE, &master_prefs)) 518 if (!PathService::Get(base::DIR_EXE, &master_prefs))
519 return base::FilePath(); 519 return base::FilePath();
520 return master_prefs.AppendASCII(installer::kDefaultMasterPrefs); 520 return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
521 } 521 }
522 522
523 } // namespace first_run 523 } // namespace first_run
OLDNEW
« no previous file with comments | « chrome/browser/first_run/first_run_posix.cc ('k') | chrome/browser/importer/external_process_importer_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698