| Index: chrome/browser/first_run/first_run_aura.cc
|
| diff --git a/chrome/browser/first_run/first_run_aura.cc b/chrome/browser/first_run/first_run_aura.cc
|
| index 6a1a7eb49bc8ac49a26408a65919dc215640422c..f6ace0dad7b60d4b458ddc67742b0d101582954e 100644
|
| --- a/chrome/browser/first_run/first_run_aura.cc
|
| +++ b/chrome/browser/first_run/first_run_aura.cc
|
| @@ -9,15 +9,16 @@
|
| #include "chrome/browser/importer/importer_host.h"
|
| #include "chrome/browser/importer/importer_list.h"
|
|
|
| -bool FirstRun::LaunchSetupWithParam(const std::string& param,
|
| - const std::wstring& value,
|
| - int* ret_code) {
|
| +#if defined(OS_WIN)
|
| +bool FirstRun::WriteEULAtoTempFile(FilePath* eula_path) {
|
| // TODO(beng):
|
| NOTIMPLEMENTED();
|
| return true;
|
| }
|
|
|
| -bool FirstRun::WriteEULAtoTempFile(FilePath* eula_path) {
|
| +bool FirstRun::LaunchSetupWithParam(const std::string& param,
|
| + const std::wstring& value,
|
| + int* ret_code) {
|
| // TODO(beng):
|
| NOTIMPLEMENTED();
|
| return true;
|
| @@ -28,55 +29,71 @@ void FirstRun::DoDelayedInstallExtensions() {
|
| NOTIMPLEMENTED();
|
| }
|
|
|
| -// static
|
| -void FirstRun::PlatformSetup() {
|
| +bool FirstRun::ImportSettings(Profile* profile,
|
| + scoped_refptr<ImporterHost> importer_host,
|
| + scoped_refptr<ImporterList> importer_list,
|
| + int items_to_import) {
|
| + return ImportSettings(
|
| + profile,
|
| + importer_list->GetSourceProfileAt(0).importer_type,
|
| + items_to_import,
|
| + FilePath(),
|
| + false,
|
| + NULL);
|
| +}
|
| +
|
| +bool FirstRun::ImportSettings(Profile* profile,
|
| + int importer_type,
|
| + int items_to_import,
|
| + const FilePath& import_bookmarks_path,
|
| + bool skip_first_run_ui,
|
| + gfx::NativeWindow parent_window) {
|
| // TODO(beng):
|
| NOTIMPLEMENTED();
|
| + return false;
|
| }
|
|
|
| +int FirstRun::ImportFromBrowser(Profile* profile,
|
| + const CommandLine& cmdline) {
|
| + // TODO(beng):
|
| + NOTIMPLEMENTED();
|
| + return 0;
|
| +}
|
| +#else
|
| // static
|
| -bool FirstRun::IsOrganicFirstRun() {
|
| +bool FirstRun::ImportBookmarks(const FilePath& import_bookmarks_path) {
|
| // TODO(beng):
|
| NOTIMPLEMENTED();
|
| return true;
|
| }
|
|
|
| -// static
|
| -FilePath FirstRun::MasterPrefsPath() {
|
| - // TODO(beng):
|
| +namespace first_run {
|
| +void ShowFirstRunDialog(Profile* profile,
|
| + bool randomize_search_engine_experiment) {
|
| + // TODO(saintlou):
|
| NOTIMPLEMENTED();
|
| - return FilePath();
|
| }
|
| +} // namespace first_run
|
| +#endif
|
|
|
| // static
|
| -bool FirstRun::ImportSettings(Profile* profile,
|
| - int importer_type,
|
| - int items_to_import,
|
| - const FilePath& import_bookmarks_path,
|
| - bool skip_first_run_ui,
|
| - gfx::NativeWindow parent_window) {
|
| +void FirstRun::PlatformSetup() {
|
| // TODO(beng):
|
| NOTIMPLEMENTED();
|
| - return false;
|
| }
|
|
|
| // static
|
| -bool FirstRun::ImportSettings(Profile* profile,
|
| - scoped_refptr<ImporterHost> importer_host,
|
| - scoped_refptr<ImporterList> importer_list,
|
| - int items_to_import) {
|
| - return ImportSettings(
|
| - profile,
|
| - importer_list->GetSourceProfileAt(0).importer_type,
|
| - items_to_import,
|
| - FilePath(),
|
| - false,
|
| - NULL);
|
| +bool FirstRun::IsOrganicFirstRun() {
|
| + // TODO(beng):
|
| + NOTIMPLEMENTED();
|
| + return true;
|
| }
|
|
|
| -int FirstRun::ImportFromBrowser(Profile* profile,
|
| - const CommandLine& cmdline) {
|
| +// static
|
| +FilePath FirstRun::MasterPrefsPath() {
|
| // TODO(beng):
|
| NOTIMPLEMENTED();
|
| - return 0;
|
| + return FilePath();
|
| }
|
| +
|
| +
|
|
|