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

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

Issue 1560263002: Store Bluetooth permissions in website settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: store Bluetooth permissions in website settings Created 4 years, 11 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 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 <utility> 7 #include <utility>
8 8
9 #include "build/build_config.h" 9 #include "build/build_config.h"
10 #include "chrome/browser/autocomplete/in_memory_url_index_factory.h" 10 #include "chrome/browser/autocomplete/in_memory_url_index_factory.h"
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 #endif 121 #endif
122 122
123 #if defined(OS_CHROMEOS) 123 #if defined(OS_CHROMEOS)
124 #include "chrome/browser/chromeos/printer_detector/printer_detector_factory.h" 124 #include "chrome/browser/chromeos/printer_detector/printer_detector_factory.h"
125 #include "chrome/browser/extensions/api/platform_keys/verify_trust_api.h" 125 #include "chrome/browser/extensions/api/platform_keys/verify_trust_api.h"
126 #endif 126 #endif
127 127
128 #if defined(OS_ANDROID) 128 #if defined(OS_ANDROID)
129 #include "chrome/browser/android/data_usage/data_use_ui_tab_model_factory.h" 129 #include "chrome/browser/android/data_usage/data_use_ui_tab_model_factory.h"
130 #else 130 #else
131 #include "chrome/browser/ui/bluetooth/bluetooth_chooser_context_factory.h"
131 #include "chrome/browser/ui/global_error/global_error_service_factory.h" 132 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
132 #include "chrome/browser/usb/usb_chooser_context_factory.h" 133 #include "chrome/browser/usb/usb_chooser_context_factory.h"
133 #endif 134 #endif
134 135
135 #if defined(OS_WIN) 136 #if defined(OS_WIN)
136 #include "chrome/browser/profile_resetter/triggered_profile_resetter_factory.h" 137 #include "chrome/browser/profile_resetter/triggered_profile_resetter_factory.h"
137 #endif 138 #endif
138 139
139 #if defined(ENABLE_SPELLCHECK) 140 #if defined(ENABLE_SPELLCHECK)
140 #include "chrome/browser/spellchecker/spellcheck_factory.h" 141 #include "chrome/browser/spellchecker/spellcheck_factory.h"
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 TabRestoreServiceFactory::GetInstance(); 332 TabRestoreServiceFactory::GetInstance();
332 TemplateURLFetcherFactory::GetInstance(); 333 TemplateURLFetcherFactory::GetInstance();
333 TemplateURLServiceFactory::GetInstance(); 334 TemplateURLServiceFactory::GetInstance();
334 #if defined(ENABLE_THEMES) 335 #if defined(ENABLE_THEMES)
335 ThemeServiceFactory::GetInstance(); 336 ThemeServiceFactory::GetInstance();
336 #endif 337 #endif
337 #if defined(OS_WIN) 338 #if defined(OS_WIN)
338 TriggeredProfileResetterFactory::GetInstance(); 339 TriggeredProfileResetterFactory::GetInstance();
339 #endif 340 #endif
340 #if !defined(OS_ANDROID) 341 #if !defined(OS_ANDROID)
342 BluetoothChooserContextFactory::GetInstance();
Reilly Grant (use Gerrit) 2016/01/05 23:08:51 Bluetooth is implemented on Android so it should b
juncai 2016/01/05 23:56:15 Done.
341 UsbChooserContextFactory::GetInstance(); 343 UsbChooserContextFactory::GetInstance();
342 #endif 344 #endif
343 WebDataServiceFactory::GetInstance(); 345 WebDataServiceFactory::GetInstance();
344 } 346 }
345 347
346 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() { 348 void ChromeBrowserMainExtraPartsProfiles::PreProfileInit() {
347 EnsureBrowserContextKeyedServiceFactoriesBuilt(); 349 EnsureBrowserContextKeyedServiceFactoriesBuilt();
348 } 350 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698