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

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

Issue 8437002: Move BrowserThread to content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: A few updates. Created 9 years, 1 month 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 29 matching lines...) Expand all
40 #include "net/url_request/url_request_context.h" 40 #include "net/url_request/url_request_context.h"
41 #include "net/url_request/url_request_context_getter.h" 41 #include "net/url_request/url_request_context_getter.h"
42 #include "net/url_request/url_request_job.h" 42 #include "net/url_request/url_request_job.h"
43 #include "ui/base/l10n/l10n_util.h" 43 #include "ui/base/l10n/l10n_util.h"
44 44
45 #if defined(OS_CHROMEOS) 45 #if defined(OS_CHROMEOS)
46 #include "chrome/browser/chromeos/cros/cros_library.h" 46 #include "chrome/browser/chromeos/cros/cros_library.h"
47 #include "chrome/browser/chromeos/cros/cryptohome_library.h" 47 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
48 #endif 48 #endif
49 49
50 using content::BrowserThread;
51
50 namespace { 52 namespace {
51 53
52 // Profiles that should be deleted on shutdown. 54 // Profiles that should be deleted on shutdown.
53 std::vector<FilePath>& ProfilesToDelete() { 55 std::vector<FilePath>& ProfilesToDelete() {
54 static std::vector<FilePath> profiles_to_delete; 56 static std::vector<FilePath> profiles_to_delete;
55 return profiles_to_delete; 57 return profiles_to_delete;
56 } 58 }
57 59
58 // Simple task to log the size of the current profile. 60 // Simple task to log the size of the current profile.
59 class ProfileSizeTask : public Task { 61 class ProfileSizeTask : public Task {
(...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 ProfileManagerWithoutInit::ProfileManagerWithoutInit( 654 ProfileManagerWithoutInit::ProfileManagerWithoutInit(
653 const FilePath& user_data_dir) : ProfileManager(user_data_dir) { 655 const FilePath& user_data_dir) : ProfileManager(user_data_dir) {
654 } 656 }
655 657
656 void ProfileManager::RegisterTestingProfile(Profile* profile, 658 void ProfileManager::RegisterTestingProfile(Profile* profile,
657 bool add_to_cache) { 659 bool add_to_cache) {
658 RegisterProfile(profile, true); 660 RegisterProfile(profile, true);
659 if (add_to_cache) 661 if (add_to_cache)
660 AddProfileToCache(profile); 662 AddProfileToCache(profile);
661 } 663 }
OLDNEW
« no previous file with comments | « chrome/browser/profiles/profile_io_data.cc ('k') | chrome/browser/profiles/profile_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698