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

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

Issue 7621066: Fix sync test crashing when multiprofiles are enabled on Mac. Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: oops Created 9 years, 4 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 546 matching lines...) Expand 10 before | Expand all | Expand 10 after
557 cache.DeleteProfileFromCache(profile_dir); 557 cache.DeleteProfileFromCache(profile_dir);
558 } 558 }
559 559
560 // static 560 // static
561 bool ProfileManager::IsMultipleProfilesEnabled() { 561 bool ProfileManager::IsMultipleProfilesEnabled() {
562 #if defined(TOOLKIT_VIEWS) && !defined(OS_CHROMEOS) 562 #if defined(TOOLKIT_VIEWS) && !defined(OS_CHROMEOS)
563 return true; 563 return true;
564 #endif 564 #endif
565 return CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles); 565 return CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles);
566 } 566 }
567
568 void ProfileManager::RegisterTestingProfile(Profile* profile,
569 bool created) {
570 RegisterProfile(profile, true);
571 AddProfileToCache(profile);
572 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698