OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/ui/webui/settings/md_settings_ui.h" | 5 #include "chrome/browser/ui/webui/settings/md_settings_ui.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <memory> | 9 #include <memory> |
10 #include <string> | 10 #include <string> |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h" | 70 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h" |
71 #include "chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h" | 71 #include "chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h" |
72 #include "chrome/browser/ui/webui/settings/chromeos/date_time_handler.h" | 72 #include "chrome/browser/ui/webui/settings/chromeos/date_time_handler.h" |
73 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h" | 73 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h" |
74 #include "chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h" | 74 #include "chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h" |
75 #include "chrome/browser/ui/webui/settings/chromeos/device_power_handler.h" | 75 #include "chrome/browser/ui/webui/settings/chromeos/device_power_handler.h" |
76 #include "chrome/browser/ui/webui/settings/chromeos/device_storage_handler.h" | 76 #include "chrome/browser/ui/webui/settings/chromeos/device_storage_handler.h" |
77 #include "chrome/browser/ui/webui/settings/chromeos/device_stylus_handler.h" | 77 #include "chrome/browser/ui/webui/settings/chromeos/device_stylus_handler.h" |
78 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler
.h" | 78 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler
.h" |
79 #include "chrome/browser/ui/webui/settings/chromeos/fingerprint_handler.h" | 79 #include "chrome/browser/ui/webui/settings/chromeos/fingerprint_handler.h" |
| 80 #include "chrome/browser/ui/webui/settings/chromeos/google_assistant_handler.h" |
80 #include "chrome/browser/ui/webui/settings/chromeos/internet_handler.h" | 81 #include "chrome/browser/ui/webui/settings/chromeos/internet_handler.h" |
81 #include "chrome/common/chrome_switches.h" | 82 #include "chrome/common/chrome_switches.h" |
82 #include "components/arc/arc_util.h" | 83 #include "components/arc/arc_util.h" |
83 #else // !defined(OS_CHROMEOS) | 84 #else // !defined(OS_CHROMEOS) |
84 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h" | 85 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h" |
85 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h" | 86 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h" |
86 #include "chrome/browser/ui/webui/settings/system_handler.h" | 87 #include "chrome/browser/ui/webui/settings/system_handler.h" |
87 #endif // defined(OS_CHROMEOS) | 88 #endif // defined(OS_CHROMEOS) |
88 | 89 |
89 #if defined(USE_NSS_CERTS) | 90 #if defined(USE_NSS_CERTS) |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
158 base::MakeUnique<chromeos::settings::AccessibilityHandler>(web_ui)); | 159 base::MakeUnique<chromeos::settings::AccessibilityHandler>(web_ui)); |
159 AddSettingsPageUIHandler( | 160 AddSettingsPageUIHandler( |
160 base::MakeUnique<chromeos::settings::AndroidAppsHandler>(profile)); | 161 base::MakeUnique<chromeos::settings::AndroidAppsHandler>(profile)); |
161 AddSettingsPageUIHandler( | 162 AddSettingsPageUIHandler( |
162 base::MakeUnique<chromeos::settings::ChangePictureHandler>()); | 163 base::MakeUnique<chromeos::settings::ChangePictureHandler>()); |
163 AddSettingsPageUIHandler( | 164 AddSettingsPageUIHandler( |
164 base::MakeUnique<chromeos::settings::CupsPrintersHandler>(web_ui)); | 165 base::MakeUnique<chromeos::settings::CupsPrintersHandler>(web_ui)); |
165 AddSettingsPageUIHandler( | 166 AddSettingsPageUIHandler( |
166 base::MakeUnique<chromeos::settings::FingerprintHandler>(profile)); | 167 base::MakeUnique<chromeos::settings::FingerprintHandler>(profile)); |
167 AddSettingsPageUIHandler( | 168 AddSettingsPageUIHandler( |
| 169 base::MakeUnique<chromeos::settings::GoogleAssistantHandler>(profile)); |
| 170 AddSettingsPageUIHandler( |
168 base::MakeUnique<chromeos::settings::KeyboardHandler>()); | 171 base::MakeUnique<chromeos::settings::KeyboardHandler>()); |
169 AddSettingsPageUIHandler( | 172 AddSettingsPageUIHandler( |
170 base::MakeUnique<chromeos::settings::PointerHandler>()); | 173 base::MakeUnique<chromeos::settings::PointerHandler>()); |
171 AddSettingsPageUIHandler( | 174 AddSettingsPageUIHandler( |
172 base::MakeUnique<chromeos::settings::StorageHandler>()); | 175 base::MakeUnique<chromeos::settings::StorageHandler>()); |
173 AddSettingsPageUIHandler( | 176 AddSettingsPageUIHandler( |
174 base::MakeUnique<chromeos::settings::StylusHandler>()); | 177 base::MakeUnique<chromeos::settings::StylusHandler>()); |
175 AddSettingsPageUIHandler( | 178 AddSettingsPageUIHandler( |
176 base::MakeUnique<chromeos::settings::InternetHandler>()); | 179 base::MakeUnique<chromeos::settings::InternetHandler>()); |
177 #else | 180 #else |
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
328 std::unique_ptr<base::DictionaryValue> update(new base::DictionaryValue); | 331 std::unique_ptr<base::DictionaryValue> update(new base::DictionaryValue); |
329 update->SetBoolean("chromeCleanupEnabled", cleanupEnabled); | 332 update->SetBoolean("chromeCleanupEnabled", cleanupEnabled); |
330 update->SetBoolean("cleanupPoweredByPartner", partnerPowered); | 333 update->SetBoolean("cleanupPoweredByPartner", partnerPowered); |
331 | 334 |
332 content::WebUIDataSource::Update(profile, chrome::kChromeUISettingsHost, | 335 content::WebUIDataSource::Update(profile, chrome::kChromeUISettingsHost, |
333 std::move(update)); | 336 std::move(update)); |
334 } | 337 } |
335 #endif // defined(OS_WIN) | 338 #endif // defined(OS_WIN) |
336 | 339 |
337 } // namespace settings | 340 } // namespace settings |
OLD | NEW |