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

Side by Side Diff: content/browser/browser_context.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/public/browser/browser_context.h" 5 #include "content/public/browser/browser_context.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <algorithm> 9 #include <algorithm>
10 #include <limits> 10 #include <limits>
(...skipping 24 matching lines...) Expand all
35 #include "content/public/common/service_manager_connection.h" 35 #include "content/public/common/service_manager_connection.h"
36 #include "content/public/common/service_names.h" 36 #include "content/public/common/service_names.h"
37 #include "net/cookies/cookie_store.h" 37 #include "net/cookies/cookie_store.h"
38 #include "net/ssl/channel_id_service.h" 38 #include "net/ssl/channel_id_service.h"
39 #include "net/ssl/channel_id_store.h" 39 #include "net/ssl/channel_id_store.h"
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 "services/file/file_service.h" 42 #include "services/file/file_service.h"
43 #include "services/file/public/cpp/constants.h" 43 #include "services/file/public/cpp/constants.h"
44 #include "services/file/user_id_map.h" 44 #include "services/file/user_id_map.h"
45 #include "services/shell/public/cpp/connection.h" 45 #include "services/service_manager/public/cpp/connection.h"
46 #include "services/shell/public/cpp/connector.h" 46 #include "services/service_manager/public/cpp/connector.h"
47 #include "services/shell/public/interfaces/service.mojom.h" 47 #include "services/service_manager/public/interfaces/service.mojom.h"
48 #include "storage/browser/database/database_tracker.h" 48 #include "storage/browser/database/database_tracker.h"
49 #include "storage/browser/fileapi/external_mount_points.h" 49 #include "storage/browser/fileapi/external_mount_points.h"
50 50
51 using base::UserDataAdapter; 51 using base::UserDataAdapter;
52 52
53 namespace content { 53 namespace content {
54 54
55 namespace { 55 namespace {
56 56
57 base::LazyInstance<std::map<std::string, BrowserContext*>> 57 base::LazyInstance<std::map<std::string, BrowserContext*>>
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
519 if (GetUserData(kDownloadManagerKeyName)) 519 if (GetUserData(kDownloadManagerKeyName))
520 GetDownloadManager(this)->Shutdown(); 520 GetDownloadManager(this)->Shutdown();
521 } 521 }
522 522
523 void BrowserContext::ShutdownStoragePartitions() { 523 void BrowserContext::ShutdownStoragePartitions() {
524 if (GetUserData(kStoragePartitionMapKeyName)) 524 if (GetUserData(kStoragePartitionMapKeyName))
525 RemoveUserData(kStoragePartitionMapKeyName); 525 RemoveUserData(kStoragePartitionMapKeyName);
526 } 526 }
527 527
528 } // namespace content 528 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/battery_status/battery_monitor_integration_browsertest.cc ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698