| OLD | NEW |
|---|
| 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 541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 552 Profile* profile = GetProfileByPath(profile_dir); | 552 Profile* profile = GetProfileByPath(profile_dir); |
| 553 if (profile) | 553 if (profile) |
| 554 BrowserList::CloseAllBrowsersWithProfile(profile); | 554 BrowserList::CloseAllBrowsersWithProfile(profile); |
| 555 profiles_to_delete_.push_back(profile_dir); | 555 profiles_to_delete_.push_back(profile_dir); |
| 556 ProfileInfoCache& cache = GetProfileInfoCache(); | 556 ProfileInfoCache& cache = GetProfileInfoCache(); |
| 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) |
| 563 return true; |
| 564 #endif |
| 562 return CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles); | 565 return CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles); |
| 563 } | 566 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 7492076:
Reenable multi-profiles by default after m14 branch. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src/