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

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

Issue 1528963002: Quirks Client for downloading and providing display profiles (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: stevenjb@'s latest code review (small tweaks) Created 4 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 (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 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 21 matching lines...) Expand all
32 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" 32 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h"
33 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 33 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
34 #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification .h" 34 #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification .h"
35 #include "chrome/browser/chromeos/arc/arc_service_launcher.h" 35 #include "chrome/browser/chromeos/arc/arc_service_launcher.h"
36 #include "chrome/browser/chromeos/boot_times_recorder.h" 36 #include "chrome/browser/chromeos/boot_times_recorder.h"
37 #include "chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate. h" 37 #include "chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate. h"
38 #include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_del egate.h" 38 #include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_del egate.h"
39 #include "chrome/browser/chromeos/dbus/chrome_proxy_resolver_delegate.h" 39 #include "chrome/browser/chromeos/dbus/chrome_proxy_resolver_delegate.h"
40 #include "chrome/browser/chromeos/dbus/kiosk_info_service_provider.h" 40 #include "chrome/browser/chromeos/dbus/kiosk_info_service_provider.h"
41 #include "chrome/browser/chromeos/dbus/screen_lock_service_provider.h" 41 #include "chrome/browser/chromeos/dbus/screen_lock_service_provider.h"
42 #include "chrome/browser/chromeos/display/quirks_manager_delegate_impl.h"
42 #include "chrome/browser/chromeos/events/event_rewriter.h" 43 #include "chrome/browser/chromeos/events/event_rewriter.h"
43 #include "chrome/browser/chromeos/events/event_rewriter_controller.h" 44 #include "chrome/browser/chromeos/events/event_rewriter_controller.h"
44 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h" 45 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h"
45 #include "chrome/browser/chromeos/extensions/default_app_order.h" 46 #include "chrome/browser/chromeos/extensions/default_app_order.h"
46 #include "chrome/browser/chromeos/external_metrics.h" 47 #include "chrome/browser/chromeos/external_metrics.h"
47 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" 48 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
48 #include "chrome/browser/chromeos/input_method/input_method_util.h" 49 #include "chrome/browser/chromeos/input_method/input_method_util.h"
49 #include "chrome/browser/chromeos/language_preferences.h" 50 #include "chrome/browser/chromeos/language_preferences.h"
50 #include "chrome/browser/chromeos/login/helper.h" 51 #include "chrome/browser/chromeos/login/helper.h"
51 #include "chrome/browser/chromeos/login/lock/screen_locker.h" 52 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 #endif 393 #endif
393 394
394 // Set the crypto thread after the IO thread has been created/started. 395 // Set the crypto thread after the IO thread has been created/started.
395 TPMTokenLoader::Get()->SetCryptoTaskRunner( 396 TPMTokenLoader::Get()->SetCryptoTaskRunner(
396 content::BrowserThread::GetMessageLoopProxyForThread( 397 content::BrowserThread::GetMessageLoopProxyForThread(
397 content::BrowserThread::IO)); 398 content::BrowserThread::IO));
398 399
399 CrasAudioHandler::Initialize( 400 CrasAudioHandler::Initialize(
400 new AudioDevicesPrefHandlerImpl(g_browser_process->local_state())); 401 new AudioDevicesPrefHandlerImpl(g_browser_process->local_state()));
401 402
403 quirks::QuirksManager::Initialize(
404 scoped_ptr<quirks::QuirksManager::Delegate>(
405 new quirks::QuirksManagerDelegateImpl()),
406 content::BrowserThread::GetBlockingPool(),
407 g_browser_process->local_state(),
408 g_browser_process->system_request_context());
409
402 // Start loading machine statistics here. StatisticsProvider::Shutdown() 410 // Start loading machine statistics here. StatisticsProvider::Shutdown()
403 // will ensure that loading is aborted on early exit. 411 // will ensure that loading is aborted on early exit.
404 bool load_oem_statistics = !StartupUtils::IsOobeCompleted(); 412 bool load_oem_statistics = !StartupUtils::IsOobeCompleted();
405 system::StatisticsProvider::GetInstance()->StartLoadingMachineStatistics( 413 system::StatisticsProvider::GetInstance()->StartLoadingMachineStatistics(
406 content::BrowserThread::GetMessageLoopProxyForThread( 414 content::BrowserThread::GetMessageLoopProxyForThread(
407 content::BrowserThread::FILE), 415 content::BrowserThread::FILE),
408 load_oem_statistics); 416 load_oem_statistics);
409 417
410 base::FilePath downloads_directory; 418 base::FilePath downloads_directory;
411 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); 419 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory));
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after
835 AccessibilityManager::Shutdown(); 843 AccessibilityManager::Shutdown();
836 844
837 input_method::Shutdown(); 845 input_method::Shutdown();
838 846
839 // Stops all in-flight OAuth2 token fetchers before the IO thread stops. 847 // Stops all in-flight OAuth2 token fetchers before the IO thread stops.
840 DeviceOAuth2TokenServiceFactory::Shutdown(); 848 DeviceOAuth2TokenServiceFactory::Shutdown();
841 849
842 // Shutdown after PostMainMessageLoopRun() which should destroy all observers. 850 // Shutdown after PostMainMessageLoopRun() which should destroy all observers.
843 CrasAudioHandler::Shutdown(); 851 CrasAudioHandler::Shutdown();
844 852
853 quirks::QuirksManager::Shutdown();
854
845 // Called after 855 // Called after
846 // ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() to be 856 // ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() to be
847 // executed after execution of chrome::CloseAsh(), because some 857 // executed after execution of chrome::CloseAsh(), because some
848 // parts of WebUI depends on NetworkPortalDetector. 858 // parts of WebUI depends on NetworkPortalDetector.
849 network_portal_detector::Shutdown(); 859 network_portal_detector::Shutdown();
850 860
851 g_browser_process->platform_part()->DestroyChromeUserManager(); 861 g_browser_process->platform_part()->DestroyChromeUserManager();
852 862
853 g_browser_process->platform_part()->ShutdownSessionManager(); 863 g_browser_process->platform_part()->ShutdownSessionManager();
854 } 864 }
855 865
856 void ChromeBrowserMainPartsChromeos::PostDestroyThreads() { 866 void ChromeBrowserMainPartsChromeos::PostDestroyThreads() {
857 // Destroy DBus services immediately after threads are stopped. 867 // Destroy DBus services immediately after threads are stopped.
858 dbus_services_.reset(); 868 dbus_services_.reset();
859 869
860 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 870 ChromeBrowserMainPartsLinux::PostDestroyThreads();
861 871
862 // Destroy DeviceSettingsService after g_browser_process. 872 // Destroy DeviceSettingsService after g_browser_process.
863 DeviceSettingsService::Shutdown(); 873 DeviceSettingsService::Shutdown();
864 } 874 }
865 875
866 } // namespace chromeos 876 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698