Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" | 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 975 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 986 keyboard_event_rewriters_->Init(); | 986 keyboard_event_rewriters_->Init(); |
| 987 } | 987 } |
| 988 | 988 |
| 989 // In classic ash must occur after ash::ShellPort is initialized. Triggers a | 989 // In classic ash must occur after ash::ShellPort is initialized. Triggers a |
| 990 // fetch of the initial CrosSettings DeviceRebootOnShutdown policy. | 990 // fetch of the initial CrosSettings DeviceRebootOnShutdown policy. |
| 991 shutdown_policy_forwarder_ = base::MakeUnique<ShutdownPolicyForwarder>(); | 991 shutdown_policy_forwarder_ = base::MakeUnique<ShutdownPolicyForwarder>(); |
| 992 | 992 |
| 993 if (!base::CommandLine::ForCurrentProcess()->HasSwitch( | 993 if (!base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 994 ash::switches::kAshDisableNightLight)) { | 994 ash::switches::kAshDisableNightLight)) { |
| 995 night_light_client_ = base::MakeUnique<NightLightClient>( | 995 night_light_client_ = base::MakeUnique<NightLightClient>( |
| 996 g_browser_process->system_request_context()); | 996 g_browser_process->system_request_context(), nullptr, nullptr); |
|
stevenjb
2017/07/01 00:31:26
Comment these, e.g. nullptr /* no TickClock overri
afakhry
2017/07/01 00:57:45
Not needed anymore.
| |
| 997 night_light_client_->Start(); | 997 night_light_client_->Start(); |
| 998 } | 998 } |
| 999 | 999 |
| 1000 ChromeBrowserMainPartsLinux::PostBrowserStart(); | 1000 ChromeBrowserMainPartsLinux::PostBrowserStart(); |
| 1001 } | 1001 } |
| 1002 | 1002 |
| 1003 // Shut down services before the browser process, etc are destroyed. | 1003 // Shut down services before the browser process, etc are destroyed. |
| 1004 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() { | 1004 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() { |
| 1005 chromeos::ResourceReporter::GetInstance()->StopMonitoring(); | 1005 chromeos::ResourceReporter::GetInstance()->StopMonitoring(); |
| 1006 | 1006 |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1145 // outlive CertLoader. | 1145 // outlive CertLoader. |
| 1146 system_token_certdb_initializer_.reset(); | 1146 system_token_certdb_initializer_.reset(); |
| 1147 | 1147 |
| 1148 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 1148 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 1149 | 1149 |
| 1150 // Destroy DeviceSettingsService after g_browser_process. | 1150 // Destroy DeviceSettingsService after g_browser_process. |
| 1151 DeviceSettingsService::Shutdown(); | 1151 DeviceSettingsService::Shutdown(); |
| 1152 } | 1152 } |
| 1153 | 1153 |
| 1154 } // namespace chromeos | 1154 } // namespace chromeos |
| OLD | NEW |