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

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 11667024: Do not return profile unless it is loaded (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: No more need for NotifyProfileCreated Created 7 years, 11 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
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/chromeos/chrome_browser_main_chromeos.h" 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/shell.h" 10 #include "ash/shell.h"
(...skipping 486 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 if (!user_manager->IsLoggedInAsGuest()) { 497 if (!user_manager->IsLoggedInAsGuest()) {
498 g_browser_process->browser_policy_connector()->InitializeUserPolicy( 498 g_browser_process->browser_policy_connector()->InitializeUserPolicy(
499 username, user_manager->IsLoggedInAsPublicAccount(), 499 username, user_manager->IsLoggedInAsPublicAccount(),
500 false /* wait_for_policy_fetch */); 500 false /* wait_for_policy_fetch */);
501 } 501 }
502 502
503 // Load the default app order synchronously for restarting case. 503 // Load the default app order synchronously for restarting case.
504 app_order_loader_.reset( 504 app_order_loader_.reset(
505 new default_app_order::ExternalLoader(false /* async */)); 505 new default_app_order::ExternalLoader(false /* async */));
506 506
507 // TODO(antrim): SessionStarted notification should be moved to
508 // PostProfileInit at some point, as NOTIFICATION_SESSION_STARTED should
509 // usually go after NOTIFICATION_LOGIN_USER_PROFILE_PREPARED, which requires
Nikita (slow) 2013/01/09 13:54:33 NOTIFICATION_LOGIN_USER_PROFILE_PREPARED is called
Denis Kuznetsov (DE-MUC) 2013/01/09 14:10:49 Done.
510 // loaded profile.
511
507 user_manager->SessionStarted(); 512 user_manager->SessionStarted();
508 } 513 }
509 514
510 if (!app_order_loader_) { 515 if (!app_order_loader_) {
511 app_order_loader_.reset( 516 app_order_loader_.reset(
512 new default_app_order::ExternalLoader(true /* async */)); 517 new default_app_order::ExternalLoader(true /* async */));
513 } 518 }
514 519
515 // Initialize magnification manager before ash tray is created. And this must 520 // Initialize magnification manager before ash tray is created. And this must
516 // be placed after UserManager::SessionStarted(); 521 // be placed after UserManager::SessionStarted();
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
759 } else if (trial->group() == margin_200mb) { 764 } else if (trial->group() == margin_200mb) {
760 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; 765 LOG(WARNING) << "low_mem: Part of '200MB' experiment";
761 LowMemoryObserver::SetLowMemoryMargin(200); 766 LowMemoryObserver::SetLowMemoryMargin(200);
762 } else { 767 } else {
763 LOG(WARNING) << "low_mem: Part of 'default' experiment"; 768 LOG(WARNING) << "low_mem: Part of 'default' experiment";
764 } 769 }
765 } 770 }
766 } 771 }
767 772
768 } // namespace chromeos 773 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/profiles/profile_manager.h » ('j') | chrome/browser/profiles/profile_manager.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698