From 96788b0612875c0d12584757b63f02112e9541a7 Mon Sep 17 00:00:00 2001 From: "thakis@chromium.org" Date: Sat, 26 Jun 2010 21:45:34 +0000 Subject: Mac: First run bubble. Add a BaseBubbleController. Move ContentBlockedBubbleController to use it (other bubbles will follow in later CLs), add FIrstRunBubbleController which uses it. Move some l10n stuff to l10n_util and use that, too. Update first run code to actually call the bubble code. Fix a double free while I'm at it (the scoped_ptr<> in DoFirstRun() already does the freeing, no need to do it in FirstRunDone()) BUG=27489,36366 TEST=Firstrun bubble shows up when starting chrome with --first-run, doesn't if starting chrome without that flag. Content blocked bubbles still work. Review URL: http://codereview.chromium.org/2822026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50940 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/first_run_mac.mm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'chrome/browser/first_run_mac.mm') diff --git a/chrome/browser/first_run_mac.mm b/chrome/browser/first_run_mac.mm index 4d2d29f..a9c5d21 100644 --- a/chrome/browser/first_run_mac.mm +++ b/chrome/browser/first_run_mac.mm @@ -70,10 +70,8 @@ FirstRunController::FirstRunController() void FirstRunController::FirstRunDone() { // Set preference to show first run bubble and welcome page. - // TODO(jeremy): Implement - // FirstRun::SetShowFirstRunBubblePref(true); - // FirstRun::SetShowWelcomePagePref(); - delete this; + FirstRun::SetShowFirstRunBubblePref(true); + FirstRun::SetShowWelcomePagePref(); } bool FirstRunController::DoFirstRun(Profile* profile, @@ -151,6 +149,9 @@ bool FirstRunController::DoFirstRun(Profile* profile, ignore_result(gc.release()); StartImportingWithUI(nil, items, importer_host_.get(), source_profile, profile, this, true); + } else { + // This is called by the importer if it runs. + FirstRunDone(); } return true; -- cgit v1.1