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 8d1ea1377b0336b272068187cb0adb5d6449b9d6..e64d0cb438a4b6d0a0f70bc6b72d9287803e38b6 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_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_client_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,14 @@ void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() { |
CrasAudioHandler::Initialize( |
new AudioDevicesPrefHandlerImpl(g_browser_process->local_state())); |
+ quirks_client::QuirksClientManager::Initialize( |
+ new quirks_client::QuirksClientManager( |
stevenjb
2016/02/02 23:45:50
Rather than call Initialize with a new implementat
Greg Levin
2016/02/09 18:56:37
Done.
|
+ new quirks_client::QuirksClientDelegateImpl(), |
+ base::MessageLoopForUI::current(), |
stevenjb
2016/02/02 23:45:51
This can be called from Initialize() instead of be
Greg Levin
2016/02/09 18:56:37
Done.
oshima
2016/02/10 01:34:00
And please use base::ThreadTaskRunnerHandle::Get()
Greg Levin
2016/02/11 17:30:25
Done.
|
+ content::BrowserThread::GetBlockingPool(), |
stevenjb
2016/02/02 23:45:50
This too.
Greg Levin
2016/02/09 18:56:37
Done.
oshima
2016/02/10 01:34:00
This one should stay, because we should minimize t
Greg Levin
2016/02/11 17:30:25
Done.
|
+ 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 +824,8 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() { |
// Shutdown after PostMainMessageLoopRun() which should destroy all observers. |
CrasAudioHandler::Shutdown(); |
+ quirks_client::QuirksClientManager::Shutdown(); |
+ |
// Called after |
// ChromeBrowserMainPartsLinux::PostMainMessageLoopRun() to be |
// executed after execution of chrome::CloseAsh(), because some |