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 <string> | 9 #include <string> |
10 | 10 |
(...skipping 24 matching lines...) Expand all Loading... |
35 #include "chrome/browser/ui/webui/settings/site_settings_handler.h" | 35 #include "chrome/browser/ui/webui/settings/site_settings_handler.h" |
36 #include "chrome/common/url_constants.h" | 36 #include "chrome/common/url_constants.h" |
37 #include "chrome/grit/settings_resources.h" | 37 #include "chrome/grit/settings_resources.h" |
38 #include "chrome/grit/settings_resources_map.h" | 38 #include "chrome/grit/settings_resources_map.h" |
39 #include "content/public/browser/web_contents.h" | 39 #include "content/public/browser/web_contents.h" |
40 #include "content/public/browser/web_ui.h" | 40 #include "content/public/browser/web_ui.h" |
41 #include "content/public/browser/web_ui_data_source.h" | 41 #include "content/public/browser/web_ui_data_source.h" |
42 | 42 |
43 #if defined(OS_CHROMEOS) | 43 #if defined(OS_CHROMEOS) |
44 #include "ash/common/system/chromeos/palette/palette_utils.h" | 44 #include "ash/common/system/chromeos/palette/palette_utils.h" |
| 45 #include "chrome/browser/chromeos/arc/arc_session_manager.h" |
45 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h" | 46 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h" |
46 #include "chrome/browser/ui/webui/settings/chromeos/accessibility_handler.h" | 47 #include "chrome/browser/ui/webui/settings/chromeos/accessibility_handler.h" |
| 48 #include "chrome/browser/ui/webui/settings/chromeos/android_apps_handler.h" |
47 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h" | 49 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h" |
48 #include "chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h" | 50 #include "chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h" |
49 #include "chrome/browser/ui/webui/settings/chromeos/date_time_handler.h" | 51 #include "chrome/browser/ui/webui/settings/chromeos/date_time_handler.h" |
50 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h" | 52 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h" |
51 #include "chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h" | 53 #include "chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h" |
52 #include "chrome/browser/ui/webui/settings/chromeos/device_storage_handler.h" | 54 #include "chrome/browser/ui/webui/settings/chromeos/device_storage_handler.h" |
53 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler
.h" | 55 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler
.h" |
54 #include "chrome/browser/ui/webui/settings/chromeos/internet_handler.h" | 56 #include "chrome/browser/ui/webui/settings/chromeos/internet_handler.h" |
55 #else // !defined(OS_CHROMEOS) | 57 #else // !defined(OS_CHROMEOS) |
56 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h" | 58 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h" |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
95 AddSettingsPageUIHandler(new ProfileInfoHandler(profile)); | 97 AddSettingsPageUIHandler(new ProfileInfoHandler(profile)); |
96 AddSettingsPageUIHandler(new ProtocolHandlersHandler()); | 98 AddSettingsPageUIHandler(new ProtocolHandlersHandler()); |
97 AddSettingsPageUIHandler(new SafeBrowsingHandler(profile->GetPrefs())); | 99 AddSettingsPageUIHandler(new SafeBrowsingHandler(profile->GetPrefs())); |
98 AddSettingsPageUIHandler(new SearchEnginesHandler(profile)); | 100 AddSettingsPageUIHandler(new SearchEnginesHandler(profile)); |
99 AddSettingsPageUIHandler(new SiteSettingsHandler(profile)); | 101 AddSettingsPageUIHandler(new SiteSettingsHandler(profile)); |
100 AddSettingsPageUIHandler(new StartupPagesHandler(web_ui)); | 102 AddSettingsPageUIHandler(new StartupPagesHandler(web_ui)); |
101 | 103 |
102 #if defined(OS_CHROMEOS) | 104 #if defined(OS_CHROMEOS) |
103 AddSettingsPageUIHandler(new chromeos::settings::AccessibilityHandler( | 105 AddSettingsPageUIHandler(new chromeos::settings::AccessibilityHandler( |
104 web_ui)); | 106 web_ui)); |
| 107 AddSettingsPageUIHandler(new chromeos::settings::AndroidAppsHandler(profile)); |
105 AddSettingsPageUIHandler(new chromeos::settings::ChangePictureHandler()); | 108 AddSettingsPageUIHandler(new chromeos::settings::ChangePictureHandler()); |
106 AddSettingsPageUIHandler(new chromeos::settings::CupsPrintersHandler(web_ui)); | 109 AddSettingsPageUIHandler(new chromeos::settings::CupsPrintersHandler(web_ui)); |
107 AddSettingsPageUIHandler(new chromeos::settings::KeyboardHandler(web_ui)); | 110 AddSettingsPageUIHandler(new chromeos::settings::KeyboardHandler(web_ui)); |
108 AddSettingsPageUIHandler(new chromeos::settings::PointerHandler()); | 111 AddSettingsPageUIHandler(new chromeos::settings::PointerHandler()); |
109 AddSettingsPageUIHandler(new chromeos::settings::StorageHandler()); | 112 AddSettingsPageUIHandler(new chromeos::settings::StorageHandler()); |
110 AddSettingsPageUIHandler(new chromeos::settings::InternetHandler()); | 113 AddSettingsPageUIHandler(new chromeos::settings::InternetHandler()); |
111 #else | 114 #else |
112 AddSettingsPageUIHandler(new DefaultBrowserHandler(web_ui)); | 115 AddSettingsPageUIHandler(new DefaultBrowserHandler(web_ui)); |
113 AddSettingsPageUIHandler(new ManageProfileHandler(profile)); | 116 AddSettingsPageUIHandler(new ManageProfileHandler(profile)); |
114 AddSettingsPageUIHandler(new SystemHandler()); | 117 AddSettingsPageUIHandler(new SystemHandler()); |
(...skipping 13 matching lines...) Expand all Loading... |
128 profile); | 131 profile); |
129 if (easy_unlock_handler) | 132 if (easy_unlock_handler) |
130 AddSettingsPageUIHandler(easy_unlock_handler); | 133 AddSettingsPageUIHandler(easy_unlock_handler); |
131 | 134 |
132 AddSettingsPageUIHandler( | 135 AddSettingsPageUIHandler( |
133 chromeos::settings::DateTimeHandler::Create(html_source)); | 136 chromeos::settings::DateTimeHandler::Create(html_source)); |
134 | 137 |
135 html_source->AddBoolean("stylusAllowed", ash::IsPaletteFeatureEnabled()); | 138 html_source->AddBoolean("stylusAllowed", ash::IsPaletteFeatureEnabled()); |
136 html_source->AddBoolean("pinUnlockEnabled", | 139 html_source->AddBoolean("pinUnlockEnabled", |
137 chromeos::IsPinUnlockEnabled(profile->GetPrefs())); | 140 chromeos::IsPinUnlockEnabled(profile->GetPrefs())); |
| 141 html_source->AddBoolean( |
| 142 "androidAppsAllowed", |
| 143 arc::ArcSessionManager::IsAllowedForProfile(profile) && |
| 144 !arc::ArcSessionManager::IsOptInVerificationDisabled()); |
138 #endif | 145 #endif |
139 | 146 |
140 AddSettingsPageUIHandler(AboutHandler::Create(html_source, profile)); | 147 AddSettingsPageUIHandler(AboutHandler::Create(html_source, profile)); |
141 AddSettingsPageUIHandler(ResetSettingsHandler::Create(html_source, profile)); | 148 AddSettingsPageUIHandler(ResetSettingsHandler::Create(html_source, profile)); |
142 | 149 |
143 // Add all settings resources. | 150 // Add all settings resources. |
144 for (size_t i = 0; i < kSettingsResourcesSize; ++i) { | 151 for (size_t i = 0; i < kSettingsResourcesSize; ++i) { |
145 html_source->AddResourcePath(kSettingsResources[i].name, | 152 html_source->AddResourcePath(kSettingsResources[i].name, |
146 kSettingsResources[i].value); | 153 kSettingsResources[i].value); |
147 } | 154 } |
(...skipping 27 matching lines...) Expand all Loading... |
175 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", | 182 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", |
176 base::Time::Now() - load_start_time_); | 183 base::Time::Now() - load_start_time_); |
177 } | 184 } |
178 | 185 |
179 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { | 186 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { |
180 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", | 187 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", |
181 base::Time::Now() - load_start_time_); | 188 base::Time::Now() - load_start_time_); |
182 } | 189 } |
183 | 190 |
184 } // namespace settings | 191 } // namespace settings |
OLD | NEW |