Chromium Code Reviews| 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..29a944ab2fe47003769fdcb2dcd8d123c655c82f 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_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,12 @@ void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() { |
| CrasAudioHandler::Initialize( |
| new AudioDevicesPrefHandlerImpl(g_browser_process->local_state())); |
| + quirks_client::QuirksClientManager::Initialize( |
| + new quirks_client::QuirksClientDelegateImpl(), |
|
oshima
2016/02/11 20:05:51
pass as scoped_ptr?
Greg Levin
2016/02/12 04:48:04
Done... does this look ok? make_scoped_ptr wasn't
|
| + 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 +822,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 |