Aura under Linux is enabled with:

   'use_aura': 1,

BUG=none
TEST=none

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

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

2 files changed, 52 insertions, 33 deletions

diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc
index 746d54b..f73f179 100644
--- a/chrome/browser/first_run/first_run.cc
+++ b/chrome/browser/first_run/first_run.cc
@@ -319,7 +319,9 @@ bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir,
       installer::master_preferences::kDistroImportBookmarksFromFilePref,
       &import_bookmarks_path);
 
-#if defined(OS_WIN)
+#if defined(USE_AURA)
+  // TODO(saintlou):
+#elif defined(OS_WIN)
   if (!IsOrganicFirstRun()) {
     // If search engines aren't explicitly imported, don't import.
     if (!(out_prefs->do_import_items & importer::SEARCH_ENGINES)) {
diff --git a/chrome/browser/first_run/first_run_aura.cc b/chrome/browser/first_run/first_run_aura.cc
index 6a1a7eb..f6ace0d 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();
 }
+
+