OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/chromeos/printer_detector/printer_detector_factory.h" | 5 #include "chrome/browser/chromeos/printer_detector/printer_detector_factory.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "chrome/browser/chromeos/printer_detector/printer_detector.h" | 8 #include "chrome/browser/chromeos/printer_detector/printer_detector.h" |
9 #include "chrome/browser/chromeos/printing/printers_manager_factory.h" | 9 #include "chrome/browser/chromeos/printing/printers_manager_factory.h" |
| 10 #include "chrome/browser/profiles/incognito_helpers.h" |
10 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
11 #include "chrome/common/chrome_switches.h" | 12 #include "chrome/common/chrome_switches.h" |
12 #include "components/keyed_service/content/browser_context_dependency_manager.h" | 13 #include "components/keyed_service/content/browser_context_dependency_manager.h" |
13 #include "extensions/browser/extensions_browser_client.h" | 14 #include "extensions/browser/extensions_browser_client.h" |
14 | 15 |
15 namespace chromeos { | 16 namespace chromeos { |
16 | 17 |
17 namespace { | 18 namespace { |
18 | 19 |
19 static base::LazyInstance<PrinterDetectorFactory>::DestructorAtExit g_factory = | 20 static base::LazyInstance<PrinterDetectorFactory>::DestructorAtExit g_factory = |
(...skipping 16 matching lines...) Expand all Loading... |
36 "PrinterDetectorFactory", | 37 "PrinterDetectorFactory", |
37 BrowserContextDependencyManager::GetInstance()) { | 38 BrowserContextDependencyManager::GetInstance()) { |
38 DependsOn( | 39 DependsOn( |
39 extensions::ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); | 40 extensions::ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); |
40 DependsOn(PrintersManagerFactory::GetInstance()); | 41 DependsOn(PrintersManagerFactory::GetInstance()); |
41 } | 42 } |
42 | 43 |
43 PrinterDetectorFactory::~PrinterDetectorFactory() { | 44 PrinterDetectorFactory::~PrinterDetectorFactory() { |
44 } | 45 } |
45 | 46 |
| 47 content::BrowserContext* PrinterDetectorFactory::GetBrowserContextToUse( |
| 48 content::BrowserContext* context) const { |
| 49 return chrome::GetBrowserContextRedirectedInIncognito(context); |
| 50 } |
| 51 |
46 KeyedService* PrinterDetectorFactory::BuildServiceInstanceFor( | 52 KeyedService* PrinterDetectorFactory::BuildServiceInstanceFor( |
47 content::BrowserContext* context) const { | 53 content::BrowserContext* context) const { |
48 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | 54 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
49 ::switches::kDisableNativeCups)) { | 55 ::switches::kDisableNativeCups)) { |
50 return PrinterDetector::CreateLegacy(Profile::FromBrowserContext(context)) | 56 return PrinterDetector::CreateLegacy(Profile::FromBrowserContext(context)) |
51 .release(); | 57 .release(); |
52 } | 58 } |
53 | 59 |
54 return PrinterDetector::CreateCups(Profile::FromBrowserContext(context)) | 60 return PrinterDetector::CreateCups(Profile::FromBrowserContext(context)) |
55 .release(); | 61 .release(); |
56 } | 62 } |
57 | 63 |
58 bool PrinterDetectorFactory::ServiceIsCreatedWithBrowserContext() const { | 64 bool PrinterDetectorFactory::ServiceIsCreatedWithBrowserContext() const { |
59 return true; | 65 return true; |
60 } | 66 } |
61 | 67 |
62 bool PrinterDetectorFactory::ServiceIsNULLWhileTesting() const { | 68 bool PrinterDetectorFactory::ServiceIsNULLWhileTesting() const { |
63 return true; | 69 return true; |
64 } | 70 } |
65 | 71 |
66 } // namespace chromeos | 72 } // namespace chromeos |
OLD | NEW |