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

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

Issue 9153008: Progressively refacto FirstRun class to first_run namespace(part 4). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 11 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 | « chrome/browser/first_run/first_run_mac.mm ('k') | chrome/browser/ui/cocoa/first_run_dialog.mm » ('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 <shlobj.h> 7 #include <shlobj.h>
8 #include <windows.h> 8 #include <windows.h>
9 9
10 #include <set> 10 #include <set>
(...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after
475 int ImportNow(Profile* profile, const CommandLine& cmdline) { 475 int ImportNow(Profile* profile, const CommandLine& cmdline) {
476 int return_code = internal::ImportBookmarkFromFileIfNeeded(profile, cmdline); 476 int return_code = internal::ImportBookmarkFromFileIfNeeded(profile, cmdline);
477 #if !defined(USE_AURA) 477 #if !defined(USE_AURA)
478 if (cmdline.HasSwitch(switches::kImport)) { 478 if (cmdline.HasSwitch(switches::kImport)) {
479 return_code = ImportFromBrowser(profile, cmdline); 479 return_code = ImportFromBrowser(profile, cmdline);
480 } 480 }
481 #endif 481 #endif
482 return return_code; 482 return return_code;
483 } 483 }
484 484
485 } // namespace first_run 485 FilePath MasterPrefsPath() {
486
487 // static
488 FilePath FirstRun::MasterPrefsPath() {
489 // The standard location of the master prefs is next to the chrome binary. 486 // The standard location of the master prefs is next to the chrome binary.
490 FilePath master_prefs; 487 FilePath master_prefs;
491 if (!PathService::Get(base::DIR_EXE, &master_prefs)) 488 if (!PathService::Get(base::DIR_EXE, &master_prefs))
492 return FilePath(); 489 return FilePath();
493 return master_prefs.AppendASCII(installer::kDefaultMasterPrefs); 490 return master_prefs.AppendASCII(installer::kDefaultMasterPrefs);
494 } 491 }
492
493 } // namespace first_run
OLDNEW
« no previous file with comments | « chrome/browser/first_run/first_run_mac.mm ('k') | chrome/browser/ui/cocoa/first_run_dialog.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698