| Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| index 5300d0a12a22de6f83fa092bc56807ce0582b928..b079f82cd8d36d3d78b2487ca8f44faf18e51ef3 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| @@ -40,6 +40,7 @@
|
| #include "chrome/browser/chromeos/dbus/chrome_proxy_resolver_delegate.h"
|
| #include "chrome/browser/chromeos/dbus/kiosk_info_service_provider.h"
|
| #include "chrome/browser/chromeos/dbus/screen_lock_service_provider.h"
|
| +#include "chrome/browser/chromeos/display/quirks_manager_delegate_impl.h"
|
| #include "chrome/browser/chromeos/events/event_rewriter.h"
|
| #include "chrome/browser/chromeos/events/event_rewriter_controller.h"
|
| #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h"
|
| @@ -392,6 +393,12 @@ void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() {
|
| CrasAudioHandler::Initialize(
|
| new AudioDevicesPrefHandlerImpl(g_browser_process->local_state()));
|
|
|
| + quirks::QuirksManager::Initialize(
|
| + new quirks::QuirksManagerDelegateImpl(),
|
| + content::BrowserThread::GetBlockingPool(),
|
| + g_browser_process->local_state(),
|
| + g_browser_process->system_request_context());
|
| +
|
| // Start loading machine statistics here. StatisticsProvider::Shutdown()
|
| // will ensure that loading is aborted on early exit.
|
| bool load_oem_statistics = !StartupUtils::IsOobeCompleted();
|
| @@ -828,6 +835,8 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
|
| // Shutdown after PostMainMessageLoopRun() which should destroy all observers.
|
| CrasAudioHandler::Shutdown();
|
|
|
| + quirks::QuirksManager::Shutdown();
|
| +
|
| // Called after
|
| // ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() to be
|
| // executed after execution of chrome::CloseAsh(), because some
|
|
|