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

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

Issue 2475813002: Enable Native CUPS printing on Chrome OS. (Closed)
Patch Set: fix histogram entry Created 3 years, 8 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 (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 540 matching lines...) Expand 10 before | Expand all | Expand 10 after
551 // Make sure that wallpaper boot transition and other delays in OOBE 551 // Make sure that wallpaper boot transition and other delays in OOBE
552 // are disabled for tests and kiosk app launch by default. 552 // are disabled for tests and kiosk app launch by default.
553 // Individual tests may enable them if they want. 553 // Individual tests may enable them if they want.
554 if (parsed_command_line().HasSwitch(::switches::kTestType) || 554 if (parsed_command_line().HasSwitch(::switches::kTestType) ||
555 ShouldAutoLaunchKioskApp(parsed_command_line())) { 555 ShouldAutoLaunchKioskApp(parsed_command_line())) {
556 WizardController::SetZeroDelays(); 556 WizardController::SetZeroDelays();
557 } 557 }
558 558
559 // Enable/disable native CUPS integration 559 // Enable/disable native CUPS integration
560 printing::PrintBackend::SetNativeCupsEnabled( 560 printing::PrintBackend::SetNativeCupsEnabled(
561 parsed_command_line().HasSwitch(::switches::kEnableNativeCups)); 561 !parsed_command_line().HasSwitch(::switches::kDisableNativeCups));
562 562
563 power_prefs_.reset(new PowerPrefs(PowerPolicyController::Get())); 563 power_prefs_.reset(new PowerPrefs(PowerPolicyController::Get()));
564 564
565 arc_kiosk_app_manager_.reset(new ArcKioskAppManager()); 565 arc_kiosk_app_manager_.reset(new ArcKioskAppManager());
566 566
567 // In Aura builds this will initialize ash::Shell. 567 // In Aura builds this will initialize ash::Shell.
568 ChromeBrowserMainPartsLinux::PreProfileInit(); 568 ChromeBrowserMainPartsLinux::PreProfileInit();
569 569
570 if (immediate_login) { 570 if (immediate_login) {
571 const std::string cryptohome_id = 571 const std::string cryptohome_id =
(...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after
957 957
958 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 958 ChromeBrowserMainPartsLinux::PostDestroyThreads();
959 959
960 // Destroy DeviceSettingsService after g_browser_process. 960 // Destroy DeviceSettingsService after g_browser_process.
961 DeviceSettingsService::Shutdown(); 961 DeviceSettingsService::Shutdown();
962 962
963 chromeos::ShutdownCloseTracking(); 963 chromeos::ShutdownCloseTracking();
964 } 964 }
965 965
966 } // namespace chromeos 966 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698