Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1036)

Side by Side Diff: chrome/browser/ui/webui/settings/md_settings_ui.cc

Issue 2629173004: MD Settings: Dual-role charger selection (Closed)
Patch Set: rebase Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <string> 9 #include <string>
10 10
(...skipping 26 matching lines...) Expand all
37 #include "chrome/browser/ui/webui/settings/site_settings_handler.h" 37 #include "chrome/browser/ui/webui/settings/site_settings_handler.h"
38 #include "chrome/common/url_constants.h" 38 #include "chrome/common/url_constants.h"
39 #include "chrome/grit/settings_resources.h" 39 #include "chrome/grit/settings_resources.h"
40 #include "chrome/grit/settings_resources_map.h" 40 #include "chrome/grit/settings_resources_map.h"
41 #include "content/public/browser/web_contents.h" 41 #include "content/public/browser/web_contents.h"
42 #include "content/public/browser/web_ui.h" 42 #include "content/public/browser/web_ui.h"
43 #include "content/public/browser/web_ui_data_source.h" 43 #include "content/public/browser/web_ui_data_source.h"
44 44
45 #if defined(OS_CHROMEOS) 45 #if defined(OS_CHROMEOS)
46 #include "ash/common/system/chromeos/palette/palette_utils.h" 46 #include "ash/common/system/chromeos/palette/palette_utils.h"
47 #include "ash/common/system/chromeos/power/power_status.h"
47 #include "chrome/browser/chromeos/arc/arc_session_manager.h" 48 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
48 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h" 49 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h"
50 #include "chrome/browser/ui/ash/ash_util.h"
49 #include "chrome/browser/ui/webui/settings/chromeos/accessibility_handler.h" 51 #include "chrome/browser/ui/webui/settings/chromeos/accessibility_handler.h"
50 #include "chrome/browser/ui/webui/settings/chromeos/android_apps_handler.h" 52 #include "chrome/browser/ui/webui/settings/chromeos/android_apps_handler.h"
51 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h" 53 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h"
52 #include "chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h" 54 #include "chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h"
53 #include "chrome/browser/ui/webui/settings/chromeos/date_time_handler.h" 55 #include "chrome/browser/ui/webui/settings/chromeos/date_time_handler.h"
54 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h" 56 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h"
55 #include "chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h" 57 #include "chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h"
58 #include "chrome/browser/ui/webui/settings/chromeos/device_power_handler.h"
56 #include "chrome/browser/ui/webui/settings/chromeos/device_storage_handler.h" 59 #include "chrome/browser/ui/webui/settings/chromeos/device_storage_handler.h"
57 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler .h" 60 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler .h"
58 #include "chrome/browser/ui/webui/settings/chromeos/internet_handler.h" 61 #include "chrome/browser/ui/webui/settings/chromeos/internet_handler.h"
62 #include "chrome/common/chrome_switches.h"
59 #else // !defined(OS_CHROMEOS) 63 #else // !defined(OS_CHROMEOS)
60 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h" 64 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h"
61 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h" 65 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h"
62 #include "chrome/browser/ui/webui/settings/system_handler.h" 66 #include "chrome/browser/ui/webui/settings/system_handler.h"
63 #endif // defined(OS_CHROMEOS) 67 #endif // defined(OS_CHROMEOS)
64 68
65 #if defined(USE_NSS_CERTS) 69 #if defined(USE_NSS_CERTS)
66 #include "chrome/browser/ui/webui/settings/certificates_handler.h" 70 #include "chrome/browser/ui/webui/settings/certificates_handler.h"
67 #elif defined(OS_WIN) || defined(OS_MACOSX) 71 #elif defined(OS_WIN) || defined(OS_MACOSX)
68 #include "chrome/browser/ui/webui/settings/native_certificates_handler.h" 72 #include "chrome/browser/ui/webui/settings/native_certificates_handler.h"
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 AddSettingsPageUIHandler(base::WrapUnique( 150 AddSettingsPageUIHandler(base::WrapUnique(
147 chromeos::settings::DateTimeHandler::Create(html_source))); 151 chromeos::settings::DateTimeHandler::Create(html_source)));
148 152
149 html_source->AddBoolean("stylusAllowed", ash::IsPaletteFeatureEnabled()); 153 html_source->AddBoolean("stylusAllowed", ash::IsPaletteFeatureEnabled());
150 html_source->AddBoolean("pinUnlockEnabled", 154 html_source->AddBoolean("pinUnlockEnabled",
151 chromeos::IsPinUnlockEnabled(profile->GetPrefs())); 155 chromeos::IsPinUnlockEnabled(profile->GetPrefs()));
152 html_source->AddBoolean( 156 html_source->AddBoolean(
153 "androidAppsAllowed", 157 "androidAppsAllowed",
154 arc::ArcSessionManager::IsAllowedForProfile(profile) && 158 arc::ArcSessionManager::IsAllowedForProfile(profile) &&
155 !arc::ArcSessionManager::IsOptInVerificationDisabled()); 159 !arc::ArcSessionManager::IsOptInVerificationDisabled());
160
161 // TODO(mash): Support Chrome power settings in Mash. crbug.com/644348
162 bool enable_power_settings =
163 !chrome::IsRunningInMash() &&
164 (switches::PowerOverlayEnabled() ||
165 (ash::PowerStatus::Get()->IsBatteryPresent() &&
166 ash::PowerStatus::Get()->SupportsDualRoleDevices()));
167 html_source->AddBoolean("enablePowerSettings", enable_power_settings);
168 if (enable_power_settings) {
169 AddSettingsPageUIHandler(
170 base::MakeUnique<chromeos::settings::PowerHandler>());
171 }
156 #endif 172 #endif
157 173
158 AddSettingsPageUIHandler( 174 AddSettingsPageUIHandler(
159 base::WrapUnique(AboutHandler::Create(html_source, profile))); 175 base::WrapUnique(AboutHandler::Create(html_source, profile)));
160 AddSettingsPageUIHandler( 176 AddSettingsPageUIHandler(
161 base::WrapUnique(ResetSettingsHandler::Create(html_source, profile))); 177 base::WrapUnique(ResetSettingsHandler::Create(html_source, profile)));
162 178
163 // Add the metrics handler to write uma stats. 179 // Add the metrics handler to write uma stats.
164 web_ui->AddMessageHandler(base::MakeUnique<MetricsHandler>()); 180 web_ui->AddMessageHandler(base::MakeUnique<MetricsHandler>());
165 181
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", 214 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD",
199 base::Time::Now() - load_start_time_); 215 base::Time::Now() - load_start_time_);
200 } 216 }
201 217
202 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { 218 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() {
203 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", 219 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD",
204 base::Time::Now() - load_start_time_); 220 base::Time::Now() - load_start_time_);
205 } 221 }
206 222
207 } // namespace settings 223 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698