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

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

Issue 7493022: Multi-Profiles: Disable multi-profiles for M14 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 532 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 Profile* profile = GetProfileByPath(profile_dir); 543 Profile* profile = GetProfileByPath(profile_dir);
544 if (profile) 544 if (profile)
545 BrowserList::CloseAllBrowsersWithProfile(profile); 545 BrowserList::CloseAllBrowsersWithProfile(profile);
546 profiles_to_delete_.push_back(profile_dir); 546 profiles_to_delete_.push_back(profile_dir);
547 ProfileInfoCache& cache = GetProfileInfoCache(); 547 ProfileInfoCache& cache = GetProfileInfoCache();
548 cache.DeleteProfileFromCache(profile_dir); 548 cache.DeleteProfileFromCache(profile_dir);
549 } 549 }
550 550
551 // static 551 // static
552 bool ProfileManager::IsMultipleProfilesEnabled() { 552 bool ProfileManager::IsMultipleProfilesEnabled() {
553 #if defined(TOOLKIT_VIEWS) && !defined(OS_CHROMEOS)
554 return true;
555 #else
556 return CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles); 553 return CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles);
557 #endif
558 } 554 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698