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

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

Issue 8810001: Fixing a problem in ProfileManager when registering testing profiles and wanting them in the prof... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: =Increasing the value returned by SyncTest::NumberOfDefaultSyncItems() Created 9 years 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 | chrome/browser/sync/test/integration/sync_test.cc » ('j') | 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 745 matching lines...) Expand 10 before | Expand all | Expand 10 after
756 } 756 }
757 } 757 }
758 758
759 ProfileManagerWithoutInit::ProfileManagerWithoutInit( 759 ProfileManagerWithoutInit::ProfileManagerWithoutInit(
760 const FilePath& user_data_dir) : ProfileManager(user_data_dir) { 760 const FilePath& user_data_dir) : ProfileManager(user_data_dir) {
761 } 761 }
762 762
763 void ProfileManager::RegisterTestingProfile(Profile* profile, 763 void ProfileManager::RegisterTestingProfile(Profile* profile,
764 bool add_to_cache) { 764 bool add_to_cache) {
765 RegisterProfile(profile, true); 765 RegisterProfile(profile, true);
766 if (add_to_cache) 766 if (add_to_cache){
767 InitProfileUserPrefs(profile);
767 AddProfileToCache(profile); 768 AddProfileToCache(profile);
769 }
768 } 770 }
769 771
770 #if defined(OS_WIN) 772 #if defined(OS_WIN)
771 void ProfileManager::RemoveProfileShortcutManagerForTesting() { 773 void ProfileManager::RemoveProfileShortcutManagerForTesting() {
772 profile_info_cache_->RemoveObserver(profile_shortcut_manager_.get()); 774 profile_info_cache_->RemoveObserver(profile_shortcut_manager_.get());
773 } 775 }
774 #endif 776 #endif
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/sync/test/integration/sync_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698