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

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: Small cleanup 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 22 matching lines...) Expand all
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_auth_service.h" 35 #include "chrome/browser/chromeos/arc/arc_auth_service.h"
36 #include "chrome/browser/chromeos/arc/arc_intent_helper_bridge.h" 36 #include "chrome/browser/chromeos/arc/arc_intent_helper_bridge.h"
37 #include "chrome/browser/chromeos/boot_times_recorder.h" 37 #include "chrome/browser/chromeos/boot_times_recorder.h"
38 #include "chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate. h" 38 #include "chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate. h"
39 #include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_del egate.h" 39 #include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_del egate.h"
40 #include "chrome/browser/chromeos/dbus/chrome_proxy_resolver_delegate.h" 40 #include "chrome/browser/chromeos/dbus/chrome_proxy_resolver_delegate.h"
41 #include "chrome/browser/chromeos/dbus/kiosk_info_service_provider.h" 41 #include "chrome/browser/chromeos/dbus/kiosk_info_service_provider.h"
42 #include "chrome/browser/chromeos/dbus/screen_lock_service_provider.h" 42 #include "chrome/browser/chromeos/dbus/screen_lock_service_provider.h"
43 #include "chrome/browser/chromeos/display/quirks_manager_delegate_impl.h"
43 #include "chrome/browser/chromeos/events/event_rewriter.h" 44 #include "chrome/browser/chromeos/events/event_rewriter.h"
44 #include "chrome/browser/chromeos/events/event_rewriter_controller.h" 45 #include "chrome/browser/chromeos/events/event_rewriter_controller.h"
45 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h" 46 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h"
46 #include "chrome/browser/chromeos/extensions/default_app_order.h" 47 #include "chrome/browser/chromeos/extensions/default_app_order.h"
47 #include "chrome/browser/chromeos/external_metrics.h" 48 #include "chrome/browser/chromeos/external_metrics.h"
48 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" 49 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
49 #include "chrome/browser/chromeos/input_method/input_method_util.h" 50 #include "chrome/browser/chromeos/input_method/input_method_util.h"
50 #include "chrome/browser/chromeos/language_preferences.h" 51 #include "chrome/browser/chromeos/language_preferences.h"
51 #include "chrome/browser/chromeos/login/helper.h" 52 #include "chrome/browser/chromeos/login/helper.h"
52 #include "chrome/browser/chromeos/login/lock/screen_locker.h" 53 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
385 #endif 386 #endif
386 387
387 // Set the crypto thread after the IO thread has been created/started. 388 // Set the crypto thread after the IO thread has been created/started.
388 TPMTokenLoader::Get()->SetCryptoTaskRunner( 389 TPMTokenLoader::Get()->SetCryptoTaskRunner(
389 content::BrowserThread::GetMessageLoopProxyForThread( 390 content::BrowserThread::GetMessageLoopProxyForThread(
390 content::BrowserThread::IO)); 391 content::BrowserThread::IO));
391 392
392 CrasAudioHandler::Initialize( 393 CrasAudioHandler::Initialize(
393 new AudioDevicesPrefHandlerImpl(g_browser_process->local_state())); 394 new AudioDevicesPrefHandlerImpl(g_browser_process->local_state()));
394 395
396 quirks::QuirksManager::Initialize(
397 scoped_ptr<quirks::QuirksManager::Delegate>(
398 new quirks::QuirksManagerDelegateImpl()),
399 content::BrowserThread::GetBlockingPool(),
400 g_browser_process->local_state(),
401 g_browser_process->system_request_context());
402
395 // Start loading machine statistics here. StatisticsProvider::Shutdown() 403 // Start loading machine statistics here. StatisticsProvider::Shutdown()
396 // will ensure that loading is aborted on early exit. 404 // will ensure that loading is aborted on early exit.
397 bool load_oem_statistics = !StartupUtils::IsOobeCompleted(); 405 bool load_oem_statistics = !StartupUtils::IsOobeCompleted();
398 system::StatisticsProvider::GetInstance()->StartLoadingMachineStatistics( 406 system::StatisticsProvider::GetInstance()->StartLoadingMachineStatistics(
399 content::BrowserThread::GetMessageLoopProxyForThread( 407 content::BrowserThread::GetMessageLoopProxyForThread(
400 content::BrowserThread::FILE), 408 content::BrowserThread::FILE),
401 load_oem_statistics); 409 load_oem_statistics);
402 410
403 base::FilePath downloads_directory; 411 base::FilePath downloads_directory;
404 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory)); 412 CHECK(PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &downloads_directory));
(...skipping 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
821 AccessibilityManager::Shutdown(); 829 AccessibilityManager::Shutdown();
822 830
823 input_method::Shutdown(); 831 input_method::Shutdown();
824 832
825 // Stops all in-flight OAuth2 token fetchers before the IO thread stops. 833 // Stops all in-flight OAuth2 token fetchers before the IO thread stops.
826 DeviceOAuth2TokenServiceFactory::Shutdown(); 834 DeviceOAuth2TokenServiceFactory::Shutdown();
827 835
828 // Shutdown after PostMainMessageLoopRun() which should destroy all observers. 836 // Shutdown after PostMainMessageLoopRun() which should destroy all observers.
829 CrasAudioHandler::Shutdown(); 837 CrasAudioHandler::Shutdown();
830 838
839 quirks::QuirksManager::Shutdown();
840
831 // Called after 841 // Called after
832 // ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() to be 842 // ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() to be
833 // executed after execution of chrome::CloseAsh(), because some 843 // executed after execution of chrome::CloseAsh(), because some
834 // parts of WebUI depends on NetworkPortalDetector. 844 // parts of WebUI depends on NetworkPortalDetector.
835 network_portal_detector::Shutdown(); 845 network_portal_detector::Shutdown();
836 846
837 g_browser_process->platform_part()->DestroyChromeUserManager(); 847 g_browser_process->platform_part()->DestroyChromeUserManager();
838 848
839 g_browser_process->platform_part()->ShutdownSessionManager(); 849 g_browser_process->platform_part()->ShutdownSessionManager();
840 } 850 }
841 851
842 void ChromeBrowserMainPartsChromeos::PostDestroyThreads() { 852 void ChromeBrowserMainPartsChromeos::PostDestroyThreads() {
843 // Destroy DBus services immediately after threads are stopped. 853 // Destroy DBus services immediately after threads are stopped.
844 dbus_services_.reset(); 854 dbus_services_.reset();
845 855
846 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 856 ChromeBrowserMainPartsLinux::PostDestroyThreads();
847 857
848 // Destroy DeviceSettingsService after g_browser_process. 858 // Destroy DeviceSettingsService after g_browser_process.
849 DeviceSettingsService::Shutdown(); 859 DeviceSettingsService::Shutdown();
850 } 860 }
851 861
852 } // namespace chromeos 862 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698