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

Unified Diff: chrome/browser/first_run/first_run_internal_posix.cc

Issue 208393020: Fix the new First Run sentinel file path determination. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Simplify changes. Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/first_run/first_run_internal_posix.cc
diff --git a/chrome/browser/first_run/first_run_internal_posix.cc b/chrome/browser/first_run/first_run_internal_posix.cc
index 8cd91a41df6e0f365de628656192e7aa8eedf049..2cd4b611011dc257c1cb149ddd92c58caf88ed91 100644
--- a/chrome/browser/first_run/first_run_internal_posix.cc
+++ b/chrome/browser/first_run/first_run_internal_posix.cc
@@ -23,8 +23,6 @@ namespace internal {
void DoPostImportPlatformSpecificTasks(Profile* profile) {
#if !defined(OS_CHROMEOS)
- // Aura needs a views implementation of the first run dialog for Linux.
- // http://crbug.com/234637
base::FilePath local_state_path;
PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path);
bool local_state_file_exists = base::PathExists(local_state_path);
@@ -45,19 +43,9 @@ void DoPostImportPlatformSpecificTasks(Profile* profile) {
#endif
}
-bool GetFirstRunSentinelFilePath(base::FilePath* path) {
- base::FilePath first_run_sentinel;
-
- if (!PathService::Get(chrome::DIR_USER_DATA, &first_run_sentinel))
- return false;
-
- *path = first_run_sentinel.Append(chrome::kFirstRunSentinel);
- return true;
-}
-
-bool GetLegacyFirstRunSentinelFilePath(base::FilePath* path) {
- // There is no legacy first run sentinel path on Posix.
- return false;
+bool IsFirstRunSentinelPresent() {
+ base::FilePath sentinel;
+ return !GetFirstRunSentinelFilePath(&sentinel) || base::PathExists(sentinel);
}
bool ShowPostInstallEULAIfNeeded(installer::MasterPreferences* install_prefs) {

Powered by Google App Engine
This is Rietveld 408576698