summaryrefslogtreecommitdiffstats
path: root/chrome/browser/first_run/first_run.cc
diff options
context:
space:
mode:
authorsaintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-18 17:28:50 +0000
committersaintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-18 17:28:50 +0000
commit3fa441d238ffa7b2cfbc4c7b623f8cb00b7c18ea (patch)
tree84794a37e500c230cb702d38aed4f3363afe755f /chrome/browser/first_run/first_run.cc
parent97fe97e78d76db3c5a0ee7c1baa06d1fcd082a1a (diff)
downloadchromium_src-3fa441d238ffa7b2cfbc4c7b623f8cb00b7c18ea.zip
chromium_src-3fa441d238ffa7b2cfbc4c7b623f8cb00b7c18ea.tar.gz
chromium_src-3fa441d238ffa7b2cfbc4c7b623f8cb00b7c18ea.tar.bz2
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
Diffstat (limited to 'chrome/browser/first_run/first_run.cc')
-rw-r--r--chrome/browser/first_run/first_run.cc4
1 files changed, 3 insertions, 1 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)) {