diff options
author | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-31 22:16:26 +0000 |
---|---|---|
committer | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-31 22:16:26 +0000 |
commit | 84c03ef3a5631759c66ee5c82f71106a77563bd0 (patch) | |
tree | f20ba055c4ce76c787bc04a59b9791f34062f198 /chrome/browser/first_run.h | |
parent | b5930829068618a12e95ffb5de7d27a87766e687 (diff) | |
download | chromium_src-84c03ef3a5631759c66ee5c82f71106a77563bd0.zip chromium_src-84c03ef3a5631759c66ee5c82f71106a77563bd0.tar.gz chromium_src-84c03ef3a5631759c66ee5c82f71106a77563bd0.tar.bz2 |
Revert changes from r22198 to r22204 and r22194. None of these changes were
supposed to be commited. Seems like git took all the temporary commits from the
base branch and uploaded them to svn.
Review URL: http://codereview.chromium.org/159736
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22206 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/first_run.h')
-rw-r--r-- | chrome/browser/first_run.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/first_run.h b/chrome/browser/first_run.h index 0914e9f..030c535 100644 --- a/chrome/browser/first_run.h +++ b/chrome/browser/first_run.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -69,8 +69,8 @@ class FirstRun { // 'master_preferences' file. static bool ProcessMasterPreferences(const FilePath& user_data_dir, const FilePath& master_prefs_path, - std::vector<std::wstring>* new_tabs, - int* ping_delay); + int* preference_details, + std::vector<std::wstring>* new_tabs); // Sets the kShouldShowFirstRunBubble local state pref so that the browser // shows the bubble once the main message loop gets going. Returns false if |