summaryrefslogtreecommitdiffstats
path: root/chrome/browser/app_controller_mac.mm
diff options
context:
space:
mode:
authormirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-20 15:40:15 +0000
committermirandac@chromium.org <mirandac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-20 15:40:15 +0000
commit056f879b0a2a3281818bda56011081a6c683208e (patch)
tree72301bfed23e902d62be2b7ae6e2a32e4114688b /chrome/browser/app_controller_mac.mm
parent87d7d88cc8a0475c96b906da6cb8807bf3a870e5 (diff)
downloadchromium_src-056f879b0a2a3281818bda56011081a6c683208e.zip
chromium_src-056f879b0a2a3281818bda56011081a6c683208e.tar.gz
chromium_src-056f879b0a2a3281818bda56011081a6c683208e.tar.bz2
Fix ThreadRestrictions problem on Mac GetDefaultProfile.
BUG=89603 TEST=No more ThreadRestrictions::SetIOAllowed Review URL: http://codereview.chromium.org/7448007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93199 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/app_controller_mac.mm')
-rw-r--r--chrome/browser/app_controller_mac.mm4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm
index 4eb186f..b1e6924 100644
--- a/chrome/browser/app_controller_mac.mm
+++ b/chrome/browser/app_controller_mac.mm
@@ -1017,9 +1017,9 @@ void RecordLastRunAppBundlePath() {
if (lastProfile_)
return lastProfile_;
- // Fallback to the default if this is the first Browser.
+ // On first launch, no profile will be stored, so use last from Local State.
if (g_browser_process->profile_manager())
- return g_browser_process->profile_manager()->GetDefaultProfile();
+ return g_browser_process->profile_manager()->GetLastUsedProfile();
return NULL;
}