summaryrefslogtreecommitdiffstats
path: root/chrome/browser/first_run_mac.mm
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-26 21:45:34 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-26 21:45:34 +0000
commit96788b0612875c0d12584757b63f02112e9541a7 (patch)
treed7eb82156c83b850d2714110dd7d8bb7aad60c41 /chrome/browser/first_run_mac.mm
parent21ca7bf8f06e3b6e608f26eed8dce30515721b86 (diff)
downloadchromium_src-96788b0612875c0d12584757b63f02112e9541a7.zip
chromium_src-96788b0612875c0d12584757b63f02112e9541a7.tar.gz
chromium_src-96788b0612875c0d12584757b63f02112e9541a7.tar.bz2
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
Diffstat (limited to 'chrome/browser/first_run_mac.mm')
-rw-r--r--chrome/browser/first_run_mac.mm9
1 files changed, 5 insertions, 4 deletions
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;