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

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

Issue 10756023: Fix the first_run regression issue related to skip_first_run_ui setting processing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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 "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/first_run/first_run_internal.h" 9 #include "chrome/browser/first_run/first_run_internal.h"
10 #include "chrome/browser/importer/importer_host.h" 10 #include "chrome/browser/importer/importer_host.h"
(...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 out_prefs->new_tabs = install_prefs->GetFirstRunTabs(); 140 out_prefs->new_tabs = install_prefs->GetFirstRunTabs();
141 141
142 internal::SetRLZPref(out_prefs, install_prefs.get()); 142 internal::SetRLZPref(out_prefs, install_prefs.get());
143 143
144 if (!internal::CopyPrefFile(user_data_dir, master_prefs_path)) 144 if (!internal::CopyPrefFile(user_data_dir, master_prefs_path))
145 return true; 145 return true;
146 146
147 internal::SetupMasterPrefsFromInstallPrefs(out_prefs, 147 internal::SetupMasterPrefsFromInstallPrefs(out_prefs,
148 install_prefs.get()); 148 install_prefs.get());
149 149
150 if (!internal::SkipFirstRunUI(install_prefs.get())) 150 if (internal::NotSkipFirstRunUI(install_prefs.get()))
151 return true; 151 return true;
152 152
153 // From here on we won't show first run so we need to do the work to show the 153 // From here on we won't show first run so we need to do the work to show the
154 // bubble anyway, unless it's already been explicitly suppressed. 154 // bubble anyway, unless it's already been explicitly suppressed.
155 SetShowFirstRunBubblePref(true); 155 SetShowFirstRunBubblePref(true);
156 156
157 // We need to be able to create the first run sentinel or else we cannot 157 // We need to be able to create the first run sentinel or else we cannot
158 // proceed because ImportSettings will launch the importer process which 158 // proceed because ImportSettings will launch the importer process which
159 // would end up here if the sentinel is not present. 159 // would end up here if the sentinel is not present.
160 if (!CreateSentinel()) 160 if (!CreateSentinel())
161 return false; 161 return false;
162 162
163 internal::SetShowWelcomePagePrefIfNeeded(install_prefs.get()); 163 internal::SetShowWelcomePagePrefIfNeeded(install_prefs.get());
164 internal::SetImportPreferencesAndLaunchImport(out_prefs, install_prefs.get()); 164 internal::SetImportPreferencesAndLaunchImport(out_prefs, install_prefs.get());
165 internal::SetDefaultBrowser(install_prefs.get()); 165 internal::SetDefaultBrowser(install_prefs.get());
166 166
167 return false; 167 return false;
168 } 168 }
169 169
170 170
171 } // namespace first_run 171 } // namespace first_run
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698