| Index: chrome/browser/first_run/first_run.h
|
| diff --git a/chrome/browser/first_run/first_run.h b/chrome/browser/first_run/first_run.h
|
| index f9b46f0688ab6c0e03bca45df69471e0d9a53905..59ffaad54a8556aef99e41153f2667dba7f51c33 100644
|
| --- a/chrome/browser/first_run/first_run.h
|
| +++ b/chrome/browser/first_run/first_run.h
|
| @@ -5,10 +5,12 @@
|
| #ifndef CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_
|
| #define CHROME_BROWSER_FIRST_RUN_FIRST_RUN_H_
|
|
|
| +#include <stdint.h>
|
| +
|
| #include <string>
|
| #include <vector>
|
|
|
| -#include "base/basictypes.h"
|
| +#include "build/build_config.h"
|
|
|
| class GURL;
|
| class Profile;
|
| @@ -155,7 +157,7 @@ void DoPostImportTasks(Profile* profile, bool make_chrome_default_for_user);
|
|
|
| // Returns the current state of AutoImport as recorded in a bitfield formed from
|
| // values in AutoImportState.
|
| -uint16 auto_import_state();
|
| +uint16_t auto_import_state();
|
|
|
| // Set a master preferences file path that overrides platform defaults.
|
| void SetMasterPrefsPathForTesting(const base::FilePath& master_prefs);
|
|
|