Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Side by Side Diff: chrome/browser/first_run/first_run.cc

Issue 7850026: Aura under Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: White spaces Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/first_run/first_run.h" 5 #include "chrome/browser/first_run/first_run.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 if (prefs.GetBool(installer::master_preferences::kDistroShowWelcomePage, 312 if (prefs.GetBool(installer::master_preferences::kDistroShowWelcomePage,
313 &value) && value) { 313 &value) && value) {
314 FirstRun::SetShowWelcomePagePref(); 314 FirstRun::SetShowWelcomePagePref();
315 } 315 }
316 316
317 std::string import_bookmarks_path; 317 std::string import_bookmarks_path;
318 prefs.GetString( 318 prefs.GetString(
319 installer::master_preferences::kDistroImportBookmarksFromFilePref, 319 installer::master_preferences::kDistroImportBookmarksFromFilePref,
320 &import_bookmarks_path); 320 &import_bookmarks_path);
321 321
322 #if defined(OS_WIN) 322 #if defined(USE_AURA)
323 // TODO(saintlou):
324 #elif defined(OS_WIN)
323 if (!IsOrganicFirstRun()) { 325 if (!IsOrganicFirstRun()) {
324 // If search engines aren't explicitly imported, don't import. 326 // If search engines aren't explicitly imported, don't import.
325 if (!(out_prefs->do_import_items & importer::SEARCH_ENGINES)) { 327 if (!(out_prefs->do_import_items & importer::SEARCH_ENGINES)) {
326 out_prefs->dont_import_items |= importer::SEARCH_ENGINES; 328 out_prefs->dont_import_items |= importer::SEARCH_ENGINES;
327 } 329 }
328 // If home page isn't explicitly imported, don't import. 330 // If home page isn't explicitly imported, don't import.
329 if (!(out_prefs->do_import_items & importer::HOME_PAGE)) { 331 if (!(out_prefs->do_import_items & importer::HOME_PAGE)) {
330 out_prefs->dont_import_items |= importer::HOME_PAGE; 332 out_prefs->dont_import_items |= importer::HOME_PAGE;
331 } 333 }
332 // If history isn't explicitly forbidden, do import. 334 // If history isn't explicitly forbidden, do import.
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
719 if (!observer->ended()) { 721 if (!observer->ended()) {
720 observer->set_should_quit_message_loop(); 722 observer->set_should_quit_message_loop();
721 MessageLoop::current()->Run(); 723 MessageLoop::current()->Run();
722 } 724 }
723 725
724 // Unfortunately there's no success/fail signal in ImporterHost. 726 // Unfortunately there's no success/fail signal in ImporterHost.
725 return true; 727 return true;
726 } 728 }
727 729
728 #endif // OS_POSIX 730 #endif // OS_POSIX
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698