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

Side by Side Diff: chrome/browser/profiles/profile_manager.cc

Issue 7780031: Fix sync test crashing when multiprofiles are enabled on Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 3 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 <set> 5 #include <set>
6 6
7 #include "chrome/browser/profiles/profile_manager.h" 7 #include "chrome/browser/profiles/profile_manager.h"
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 561 matching lines...) Expand 10 before | Expand all | Expand 10 after
572 } 572 }
573 573
574 // static 574 // static
575 bool ProfileManager::IsMultipleProfilesEnabled() { 575 bool ProfileManager::IsMultipleProfilesEnabled() {
576 return CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles); 576 return CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles);
577 } 577 }
578 578
579 ProfileManagerWithoutInit::ProfileManagerWithoutInit( 579 ProfileManagerWithoutInit::ProfileManagerWithoutInit(
580 const FilePath& user_data_dir) : ProfileManager(user_data_dir) { 580 const FilePath& user_data_dir) : ProfileManager(user_data_dir) {
581 } 581 }
582
583 void ProfileManager::RegisterTestingProfile(Profile* profile,
584 bool add_to_cache) {
585 RegisterProfile(profile, true);
586 if (add_to_cache)
587 AddProfileToCache(profile);
588 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_manager.h ('k') | chrome/browser/sync/test/integration/sync_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698