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 cd13f690ef31858c58a20299d20584c6d30e90f9..d82eea603d60aa2e754e7b12a2f38235611e3673 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_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" |
@@ -399,6 +400,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(); |
@@ -842,6 +850,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 |