| 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 eb3d3a1854430900da260540b893328f2d94eef3..acf8a4ce12c3815ee0f35e95b6107b14b535dd46 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| @@ -39,6 +39,7 @@
|
| #include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_delegate.h"
|
| #include "chrome/browser/chromeos/dbus/chrome_proxy_resolver_delegate.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"
|
| @@ -379,6 +380,13 @@ void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() {
|
| CrasAudioHandler::Initialize(
|
| new AudioDevicesPrefHandlerImpl(g_browser_process->local_state()));
|
|
|
| + quirks::QuirksManager::Initialize(
|
| + scoped_ptr<quirks::QuirksManager::Delegate>(
|
| + 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();
|
| @@ -815,6 +823,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
|
|
|