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

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

Issue 1382783002: Store USB device permissions in website settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address mlamouri@'s comments. Created 5 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h" 5 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h"
6 6
7 #include "chrome/browser/autocomplete/in_memory_url_index_factory.h" 7 #include "chrome/browser/autocomplete/in_memory_url_index_factory.h"
8 #include "chrome/browser/autocomplete/shortcuts_backend_factory.h" 8 #include "chrome/browser/autocomplete/shortcuts_backend_factory.h"
9 #include "chrome/browser/autofill/personal_data_manager_factory.h" 9 #include "chrome/browser/autofill/personal_data_manager_factory.h"
10 #include "chrome/browser/background/background_contents_service_factory.h" 10 #include "chrome/browser/background/background_contents_service_factory.h"
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 #endif 118 #endif
119 119
120 #if defined(OS_CHROMEOS) 120 #if defined(OS_CHROMEOS)
121 #include "chrome/browser/chromeos/printer_detector/printer_detector_factory.h" 121 #include "chrome/browser/chromeos/printer_detector/printer_detector_factory.h"
122 #include "chrome/browser/extensions/api/platform_keys/verify_trust_api.h" 122 #include "chrome/browser/extensions/api/platform_keys/verify_trust_api.h"
123 #endif 123 #endif
124 124
125 #if !defined(OS_ANDROID) 125 #if !defined(OS_ANDROID)
126 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h" 126 #include "chrome/browser/profile_resetter/automatic_profile_resetter_factory.h"
127 #include "chrome/browser/ui/global_error/global_error_service_factory.h" 127 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
128 #include "chrome/browser/usb/usb_chooser_context_factory.h"
128 #endif 129 #endif
129 130
130 #if defined(OS_WIN) 131 #if defined(OS_WIN)
131 #include "chrome/browser/profile_resetter/triggered_profile_resetter_factory.h" 132 #include "chrome/browser/profile_resetter/triggered_profile_resetter_factory.h"
132 #endif 133 #endif
133 134
134 #if defined(ENABLE_SPELLCHECK) 135 #if defined(ENABLE_SPELLCHECK)
135 #include "chrome/browser/spellchecker/spellcheck_factory.h" 136 #include "chrome/browser/spellchecker/spellcheck_factory.h"
136 #endif 137 #endif
137 138
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 ThumbnailServiceFactory::GetInstance(); 326 ThumbnailServiceFactory::GetInstance();
326 TabRestoreServiceFactory::GetInstance(); 327 TabRestoreServiceFactory::GetInstance();
327 TemplateURLFetcherFactory::GetInstance(); 328 TemplateURLFetcherFactory::GetInstance();
328 TemplateURLServiceFactory::GetInstance(); 329 TemplateURLServiceFactory::GetInstance();
329 #if defined(ENABLE_THEMES) 330 #if defined(ENABLE_THEMES)
330 ThemeServiceFactory::GetInstance(); 331 ThemeServiceFactory::GetInstance();
331 #endif 332 #endif
332 #if defined(OS_WIN) 333 #if defined(OS_WIN)
333 TriggeredProfileResetterFactory::GetInstance(); 334 TriggeredProfileResetterFactory::GetInstance();
334 #endif 335 #endif
336 #if !defined(OS_ANDROID)
337 UsbChooserContextFactory::GetInstance();
338 #endif
335 WebDataServiceFactory::GetInstance(); 339 WebDataServiceFactory::GetInstance();
336 } 340 }
337 341
338 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() { 342 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() {
339 EnsureBrowserContextKeyedServiceFactoriesBuilt(); 343 EnsureBrowserContextKeyedServiceFactoriesBuilt();
340 } 344 }
OLDNEW
« no previous file with comments | « chrome/browser/permissions/chooser_context_base.cc ('k') | chrome/browser/usb/usb_chooser_context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698