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

Side by Side Diff: chrome/browser/chromeos/printer_detector/printer_detector_factory.cc

Issue 2738323003: Implement basic USB setup in the cups printer detector. Factor out (Closed)
Patch Set: Fix ppd provider lifetime. It was being inappropriately deleted which meant it caused USB resoluti… Created 3 years, 9 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 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/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/common/chrome_switches.h" 11 #include "chrome/common/chrome_switches.h"
11 #include "components/keyed_service/content/browser_context_dependency_manager.h" 12 #include "components/keyed_service/content/browser_context_dependency_manager.h"
12 #include "extensions/browser/extensions_browser_client.h" 13 #include "extensions/browser/extensions_browser_client.h"
13 14
14 namespace chromeos { 15 namespace chromeos {
15 16
16 namespace { 17 namespace {
17 18
18 static base::LazyInstance<PrinterDetectorFactory>::DestructorAtExit g_factory = 19 static base::LazyInstance<PrinterDetectorFactory>::DestructorAtExit g_factory =
(...skipping 10 matching lines...) Expand all
29 return static_cast<PrinterDetector*>( 30 return static_cast<PrinterDetector*>(
30 GetServiceForBrowserContext(context, false)); 31 GetServiceForBrowserContext(context, false));
31 } 32 }
32 33
33 PrinterDetectorFactory::PrinterDetectorFactory() 34 PrinterDetectorFactory::PrinterDetectorFactory()
34 : BrowserContextKeyedServiceFactory( 35 : BrowserContextKeyedServiceFactory(
35 "PrinterDetectorFactory", 36 "PrinterDetectorFactory",
36 BrowserContextDependencyManager::GetInstance()) { 37 BrowserContextDependencyManager::GetInstance()) {
37 DependsOn( 38 DependsOn(
38 extensions::ExtensionsBrowserClient::Get()->GetExtensionSystemFactory()); 39 extensions::ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());
40 DependsOn(PrintersManagerFactory::GetInstance());
39 } 41 }
40 42
41 PrinterDetectorFactory::~PrinterDetectorFactory() { 43 PrinterDetectorFactory::~PrinterDetectorFactory() {
42 } 44 }
43 45
44 KeyedService* PrinterDetectorFactory::BuildServiceInstanceFor( 46 KeyedService* PrinterDetectorFactory::BuildServiceInstanceFor(
45 content::BrowserContext* context) const { 47 content::BrowserContext* context) const {
46 if (base::CommandLine::ForCurrentProcess()->HasSwitch( 48 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
47 ::switches::kEnableNativeCups)) { 49 ::switches::kEnableNativeCups)) {
48 return PrinterDetector::CreateCups(Profile::FromBrowserContext(context)) 50 return PrinterDetector::CreateCups(Profile::FromBrowserContext(context))
49 .release(); 51 .release();
50 } else { 52 } else {
51 return PrinterDetector::CreateLegacy(Profile::FromBrowserContext(context)) 53 return PrinterDetector::CreateLegacy(Profile::FromBrowserContext(context))
52 .release(); 54 .release();
53 } 55 }
54 } 56 }
55 57
56 bool PrinterDetectorFactory::ServiceIsCreatedWithBrowserContext() const { 58 bool PrinterDetectorFactory::ServiceIsCreatedWithBrowserContext() const {
57 return true; 59 return true;
58 } 60 }
59 61
60 bool PrinterDetectorFactory::ServiceIsNULLWhileTesting() const { 62 bool PrinterDetectorFactory::ServiceIsNULLWhileTesting() const {
61 return true; 63 return true;
62 } 64 }
63 65
64 } // namespace chromeos 66 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698