Remove aura stub of FirstRun code.

BUG=102138
TEST=NONE


Review URL: http://codereview.chromium.org/8996022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115064 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 11 insertions, 102 deletions

diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc
index fb93929..92b1787 100644
--- a/chrome/browser/first_run/first_run.cc
+++ b/chrome/browser/first_run/first_run.cc
@@ -139,10 +139,8 @@ int FirstRun::ImportNow(Profile* profile, const CommandLine& cmdline) {
     return_code = ImportFromFile(profile, cmdline);
   }
   if (cmdline.HasSwitch(switches::kImport)) {
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
     return_code = ImportFromBrowser(profile, cmdline);
-#else
-    NOTIMPLEMENTED();
 #endif
   }
   return return_code;
@@ -349,7 +347,7 @@ bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir,
           importer_list->GetSourceProfileAt(0).importer_type,
           out_prefs->do_import_items,
           FilePath::FromWStringHack(UTF8ToWide(import_bookmarks_path)),
-          true, NULL)) {
+          true)) {
       LOG(WARNING) << "silent import failed";
     }
   }
@@ -540,6 +538,7 @@ void FirstRun::AutoImport(
     bool randomize_search_engine_experiment,
     bool make_chrome_default,
     ProcessSingleton* process_singleton) {
+#if !defined(USE_AURA)
   // We need to avoid dispatching new tabs when we are importing because
   // that will lead to data corruption or a crash. Because there is no UI for
   // the import process, we pass NULL as the window to bring to the foreground
@@ -648,6 +647,7 @@ void FirstRun::AutoImport(
 
   process_singleton->Unlock();
   FirstRun::CreateSentinel();
+#endif
 }
 
 #if defined(OS_LINUX)
diff --git a/chrome/browser/first_run/first_run.h b/chrome/browser/first_run/first_run.h
index 7bdf1fc..6685f6b 100644
--- a/chrome/browser/first_run/first_run.h
+++ b/chrome/browser/first_run/first_run.h
@@ -186,12 +186,13 @@ class FirstRun {
                              int importer_type,
                              int items_to_import,
                              const FilePath& import_path,
-                             bool skip_first_run_ui,
-                             gfx::NativeView parent_window);
+                             bool skip_first_run_ui);
 
+#if !defined(USE_AURA)
   // Import browser items in this process. The browser and the items to
   // import are encoded in the command line.
   static int ImportFromBrowser(Profile* profile, const CommandLine& cmdline);
+#endif
 
 #else
   static bool ImportBookmarks(const FilePath& import_bookmarks_path);
diff --git a/chrome/browser/first_run/first_run_aura.cc b/chrome/browser/first_run/first_run_aura.cc
deleted file mode 100644
index 4709710..0000000
--- a/chrome/browser/first_run/first_run_aura.cc
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright (c) 2011 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.
-
-#include "chrome/browser/first_run/first_run.h"
-
-#include "base/logging.h"
-#include "base/file_path.h"
-#include "chrome/browser/importer/importer_host.h"
-#include "chrome/browser/importer/importer_list.h"
-
-#if defined(OS_WIN)
-bool FirstRun::WriteEULAtoTempFile(FilePath* eula_path) {
-  // TODO(beng):
-  NOTIMPLEMENTED();
-  return true;
-}
-
-bool FirstRun::LaunchSetupWithParam(const std::string& param,
-                                    const std::wstring& value,
-                                    int* ret_code) {
-  // TODO(beng):
-  NOTIMPLEMENTED();
-  return true;
-}
-
-void FirstRun::DoDelayedInstallExtensions() {
-  // TODO(beng):
-  NOTIMPLEMENTED();
-}
-
-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::ImportBookmarks(const FilePath& import_bookmarks_path) {
-  // TODO(beng):
-  NOTIMPLEMENTED();
-  return true;
-}
-
-namespace first_run {
-void ShowFirstRunDialog(Profile* profile,
-                        bool randomize_search_engine_experiment) {
-  // TODO(saintlou):
-  NOTIMPLEMENTED();
-}
-} // namespace first_run
-#endif
-
-// static
-void FirstRun::PlatformSetup() {
-  // TODO(beng):
-  NOTIMPLEMENTED();
-}
-
-// static
-FilePath FirstRun::MasterPrefsPath() {
-  // TODO(beng):
-  NOTIMPLEMENTED();
-  return FilePath();
-}
-
-
diff --git a/chrome/browser/first_run/first_run_gtk.cc b/chrome/browser/first_run/first_run_linux.cc
index eb5251a..eb5251a 100644
--- a/chrome/browser/first_run/first_run_gtk.cc
+++ b/chrome/browser/first_run/first_run_linux.cc
diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc
index e0b41e4..8de0463 100644
--- a/chrome/browser/first_run/first_run_win.cc
+++ b/chrome/browser/first_run/first_run_win.cc
@@ -321,8 +321,7 @@ bool FirstRun::ImportSettings(Profile* profile,
                               int importer_type,
                               int items_to_import,
                               const FilePath& import_bookmarks_path,
-                              bool skip_first_run_ui,
-                              HWND parent_window) {
+                              bool skip_first_run_ui) {
   const CommandLine& cmdline = *CommandLine::ForCurrentProcess();
   CommandLine import_cmd(cmdline.GetProgram());
 
@@ -378,10 +377,10 @@ bool FirstRun::ImportSettings(Profile* profile,
       importer_list->GetSourceProfileAt(0).importer_type,
       items_to_import,
       FilePath(),
-      false,
-      NULL);
+      false);
 }
 
+#if !defined(USE_AURA)
 int FirstRun::ImportFromBrowser(Profile* profile,
                                 const CommandLine& cmdline) {
   std::string import_info = cmdline.GetSwitchValueASCII(switches::kImport);
@@ -420,3 +419,4 @@ int FirstRun::ImportFromBrowser(Profile* profile,
   importer_observer.RunLoop();
   return importer_observer.import_result();
 }
+#endif  // !defined(USE_AURA)