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

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 15695010: Add ProfileManager::AllowGetDefaultProfile() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 510594852c6b4cfad2afdd8e7dc4ae0ebdd48b6b..8c78bce1323821acb9ed4989c971e83404be29f6 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -86,6 +86,7 @@
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/rlz/rlz.h"
#include "chrome/browser/storage_monitor/storage_monitor_chromeos.h"
+#include "chrome/browser/ui/ash/ash_init.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
@@ -640,6 +641,10 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() {
// -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
// -- just after CreateProfile().
+ // Initialize the Ash Shell after the Default Profile has been created and
+ // before ash dependent systems are initialized.
+ chrome::OpenAsh();
+
// Restarting Chrome inside existing user session. Possible cases:
// 1. Chrome is restarted after crash.
// 2. Chrome is started in browser_tests skipping the login flow
@@ -865,10 +870,12 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
// Clean up dependency on CrosSettings and stop pending data fetches.
KioskAppManager::Shutdown();
- ChromeBrowserMainPartsLinux::PostMainMessageLoopRun();
+ chrome::CloseAsh();
// Destroy the UserManager after ash has been destroyed.
UserManager::Destroy();
+
+ ChromeBrowserMainPartsLinux::PostMainMessageLoopRun();
}
void ChromeBrowserMainPartsChromeos::PostDestroyThreads() {

Powered by Google App Engine
This is Rietveld 408576698