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

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 1934013002: Enable the cups backend when --enable-native-cups is specified. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cupsFlag
Patch Set: Move flag check Created 4 years, 5 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
« no previous file with comments | « no previous file | printing/BUILD.gn » ('j') | printing/backend/print_backend.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/chromeos/chrome_browser_main_chromeos.h" 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 #include "content/public/browser/notification_service.h" 134 #include "content/public/browser/notification_service.h"
135 #include "content/public/common/content_switches.h" 135 #include "content/public/common/content_switches.h"
136 #include "content/public/common/main_function_params.h" 136 #include "content/public/common/main_function_params.h"
137 #include "device/bluetooth/bluetooth_adapter_factory.h" 137 #include "device/bluetooth/bluetooth_adapter_factory.h"
138 #include "device/bluetooth/dbus/bluez_dbus_manager.h" 138 #include "device/bluetooth/dbus/bluez_dbus_manager.h"
139 #include "media/audio/sounds/sounds_manager.h" 139 #include "media/audio/sounds/sounds_manager.h"
140 #include "net/base/network_change_notifier.h" 140 #include "net/base/network_change_notifier.h"
141 #include "net/socket/ssl_server_socket.h" 141 #include "net/socket/ssl_server_socket.h"
142 #include "net/url_request/url_request.h" 142 #include "net/url_request/url_request.h"
143 #include "net/url_request/url_request_context_getter.h" 143 #include "net/url_request/url_request_context_getter.h"
144 #include "printing/backend/print_backend.h"
144 #include "ui/base/ime/chromeos/ime_keyboard.h" 145 #include "ui/base/ime/chromeos/ime_keyboard.h"
145 #include "ui/base/ime/chromeos/input_method_manager.h" 146 #include "ui/base/ime/chromeos/input_method_manager.h"
146 #include "ui/base/touch/touch_device.h" 147 #include "ui/base/touch/touch_device.h"
147 #include "ui/events/event_utils.h" 148 #include "ui/events/event_utils.h"
148 149
149 #if defined(ENABLE_RLZ) 150 #if defined(ENABLE_RLZ)
150 #include "components/rlz/rlz_tracker.h" 151 #include "components/rlz/rlz_tracker.h"
151 #endif 152 #endif
152 153
153 // Exclude X11 dependents for ozone 154 // Exclude X11 dependents for ozone
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 base::Bind(&ChromeOSVersionCallback)); 499 base::Bind(&ChromeOSVersionCallback));
499 500
500 // Make sure that wallpaper boot transition and other delays in OOBE 501 // Make sure that wallpaper boot transition and other delays in OOBE
501 // are disabled for tests and kiosk app launch by default. 502 // are disabled for tests and kiosk app launch by default.
502 // Individual tests may enable them if they want. 503 // Individual tests may enable them if they want.
503 if (parsed_command_line().HasSwitch(::switches::kTestType) || 504 if (parsed_command_line().HasSwitch(::switches::kTestType) ||
504 ShouldAutoLaunchKioskApp(parsed_command_line())) { 505 ShouldAutoLaunchKioskApp(parsed_command_line())) {
505 WizardController::SetZeroDelays(); 506 WizardController::SetZeroDelays();
506 } 507 }
507 508
509 // Enable/disable native CUPS integration
510 printing::PrintBackend::SetNativeCupsEnabled(
511 parsed_command_line().HasSwitch(::switches::kEnableNativeCups));
512
508 power_prefs_.reset(new PowerPrefs(PowerPolicyController::Get())); 513 power_prefs_.reset(new PowerPrefs(PowerPolicyController::Get()));
509 514
510 // In Aura builds this will initialize ash::Shell. 515 // In Aura builds this will initialize ash::Shell.
511 ChromeBrowserMainPartsLinux::PreProfileInit(); 516 ChromeBrowserMainPartsLinux::PreProfileInit();
512 517
513 if (immediate_login) { 518 if (immediate_login) {
514 const std::string cryptohome_id = 519 const std::string cryptohome_id =
515 parsed_command_line().GetSwitchValueASCII(switches::kLoginUser); 520 parsed_command_line().GetSwitchValueASCII(switches::kLoginUser);
516 const AccountId account_id( 521 const AccountId account_id(
517 cryptohome::Identification::FromString(cryptohome_id).GetAccountId()); 522 cryptohome::Identification::FromString(cryptohome_id).GetAccountId());
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
870 // Destroy DBus services immediately after threads are stopped. 875 // Destroy DBus services immediately after threads are stopped.
871 dbus_services_.reset(); 876 dbus_services_.reset();
872 877
873 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 878 ChromeBrowserMainPartsLinux::PostDestroyThreads();
874 879
875 // Destroy DeviceSettingsService after g_browser_process. 880 // Destroy DeviceSettingsService after g_browser_process.
876 DeviceSettingsService::Shutdown(); 881 DeviceSettingsService::Shutdown();
877 } 882 }
878 883
879 } // namespace chromeos 884 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | printing/BUILD.gn » ('j') | printing/backend/print_backend.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698