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

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

Issue 15695010: Add ProfileManager::AllowGetDefaultProfile() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix browsertest Created 7 years, 7 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
« no previous file with comments | « no previous file | chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chrome_browser_main.h" 5 #include "chrome/browser/chrome_browser_main.h"
6 6
7 #if defined(TOOLKIT_GTK) 7 #if defined(TOOLKIT_GTK)
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #endif 9 #endif
10 10
(...skipping 1234 matching lines...) Expand 10 before | Expand all | Expand 10 after
1245 } 1245 }
1246 1246
1247 // Profile creation ---------------------------------------------------------- 1247 // Profile creation ----------------------------------------------------------
1248 1248
1249 if (do_first_run_tasks_) { 1249 if (do_first_run_tasks_) {
1250 // Warn the ProfileManager that an import process will run, possibly 1250 // Warn the ProfileManager that an import process will run, possibly
1251 // locking the WebDataService directory of the next Profile created. 1251 // locking the WebDataService directory of the next Profile created.
1252 browser_process_->profile_manager()->SetWillImport(); 1252 browser_process_->profile_manager()->SetWillImport();
1253 } 1253 }
1254 1254
1255 // Called before CreateProfile because creating the profile can trigger
1256 // calls to GetDefaultProfile().
1257 ProfileManager::AllowGetDefaultProfile();
1258
1255 profile_ = CreateProfile(parameters(), user_data_dir_, parsed_command_line()); 1259 profile_ = CreateProfile(parameters(), user_data_dir_, parsed_command_line());
1256 if (!profile_) 1260 if (!profile_)
1257 return content::RESULT_CODE_NORMAL_EXIT; 1261 return content::RESULT_CODE_NORMAL_EXIT;
1258 1262
1259 #if defined(ENABLE_BACKGROUND) 1263 #if defined(ENABLE_BACKGROUND)
1260 // Autoload any profiles which are running background apps. 1264 // Autoload any profiles which are running background apps.
1261 // TODO(rlp): Do this on a separate thread. See http://crbug.com/99075. 1265 // TODO(rlp): Do this on a separate thread. See http://crbug.com/99075.
1262 browser_process_->profile_manager()->AutoloadProfiles(); 1266 browser_process_->profile_manager()->AutoloadProfiles();
1263 #endif 1267 #endif
1264 // Post-profile init --------------------------------------------------------- 1268 // Post-profile init ---------------------------------------------------------
(...skipping 525 matching lines...) Expand 10 before | Expand all | Expand 10 after
1790 if (base::win::GetVersion() <= base::win::VERSION_XP) 1794 if (base::win::GetVersion() <= base::win::VERSION_XP)
1791 uma_name += "_XP"; 1795 uma_name += "_XP";
1792 1796
1793 uma_name += "_PreRead_"; 1797 uma_name += "_PreRead_";
1794 uma_name += pre_read_percentage; 1798 uma_name += pre_read_percentage;
1795 AddPreReadHistogramTime(uma_name.c_str(), time); 1799 AddPreReadHistogramTime(uma_name.c_str(), time);
1796 } 1800 }
1797 #endif 1801 #endif
1798 #endif 1802 #endif
1799 } 1803 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698