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

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

Issue 2393703005: MD Settings: Date and Time page, part 1/3 (Closed)
Patch Set: Move SetInteger to WebUI CL Created 4 years, 2 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
« no previous file with comments | « chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 24 matching lines...) Expand all
35 #include "content/public/browser/web_contents.h" 35 #include "content/public/browser/web_contents.h"
36 #include "content/public/browser/web_ui.h" 36 #include "content/public/browser/web_ui.h"
37 #include "content/public/browser/web_ui_data_source.h" 37 #include "content/public/browser/web_ui_data_source.h"
38 38
39 #if defined(OS_CHROMEOS) 39 #if defined(OS_CHROMEOS)
40 #include "ash/common/system/chromeos/palette/palette_utils.h" 40 #include "ash/common/system/chromeos/palette/palette_utils.h"
41 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h" 41 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_utils.h"
42 #include "chrome/browser/ui/webui/settings/chromeos/accessibility_handler.h" 42 #include "chrome/browser/ui/webui/settings/chromeos/accessibility_handler.h"
43 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h" 43 #include "chrome/browser/ui/webui/settings/chromeos/change_picture_handler.h"
44 #include "chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h" 44 #include "chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h"
45 #include "chrome/browser/ui/webui/settings/chromeos/date_time_handler.h"
45 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h" 46 #include "chrome/browser/ui/webui/settings/chromeos/device_keyboard_handler.h"
46 #include "chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h" 47 #include "chrome/browser/ui/webui/settings/chromeos/device_pointer_handler.h"
47 #include "chrome/browser/ui/webui/settings/chromeos/device_storage_handler.h" 48 #include "chrome/browser/ui/webui/settings/chromeos/device_storage_handler.h"
48 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler .h" 49 #include "chrome/browser/ui/webui/settings/chromeos/easy_unlock_settings_handler .h"
49 #include "chrome/browser/ui/webui/settings/chromeos/internet_handler.h" 50 #include "chrome/browser/ui/webui/settings/chromeos/internet_handler.h"
50 #else // !defined(OS_CHROMEOS) 51 #else // !defined(OS_CHROMEOS)
51 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h" 52 #include "chrome/browser/ui/webui/settings/settings_default_browser_handler.h"
52 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h" 53 #include "chrome/browser/ui/webui/settings/settings_manage_profile_handler.h"
53 #include "chrome/browser/ui/webui/settings/system_handler.h" 54 #include "chrome/browser/ui/webui/settings/system_handler.h"
54 #endif // defined(OS_CHROMEOS) 55 #endif // defined(OS_CHROMEOS)
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 content::WebUIDataSource* html_source = 114 content::WebUIDataSource* html_source =
114 content::WebUIDataSource::Create(url.host()); 115 content::WebUIDataSource::Create(url.host());
115 116
116 #if defined(OS_CHROMEOS) 117 #if defined(OS_CHROMEOS)
117 chromeos::settings::EasyUnlockSettingsHandler* easy_unlock_handler = 118 chromeos::settings::EasyUnlockSettingsHandler* easy_unlock_handler =
118 chromeos::settings::EasyUnlockSettingsHandler::Create(html_source, 119 chromeos::settings::EasyUnlockSettingsHandler::Create(html_source,
119 profile); 120 profile);
120 if (easy_unlock_handler) 121 if (easy_unlock_handler)
121 AddSettingsPageUIHandler(easy_unlock_handler); 122 AddSettingsPageUIHandler(easy_unlock_handler);
122 123
124 AddSettingsPageUIHandler(
125 chromeos::settings::DateTimeHandler::Create(html_source));
126
123 html_source->AddBoolean("stylusAllowed", ash::IsPaletteFeatureEnabled()); 127 html_source->AddBoolean("stylusAllowed", ash::IsPaletteFeatureEnabled());
124 html_source->AddBoolean("quickUnlockEnabled", 128 html_source->AddBoolean("quickUnlockEnabled",
125 chromeos::IsQuickUnlockEnabled()); 129 chromeos::IsQuickUnlockEnabled());
126 #endif 130 #endif
127 131
128 AddSettingsPageUIHandler(AboutHandler::Create(html_source, profile)); 132 AddSettingsPageUIHandler(AboutHandler::Create(html_source, profile));
129 AddSettingsPageUIHandler(ResetSettingsHandler::Create(html_source, profile)); 133 AddSettingsPageUIHandler(ResetSettingsHandler::Create(html_source, profile));
130 134
131 // Add all settings resources. 135 // Add all settings resources.
132 for (size_t i = 0; i < kSettingsResourcesSize; ++i) { 136 for (size_t i = 0; i < kSettingsResourcesSize; ++i) {
(...skipping 30 matching lines...) Expand all
163 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD", 167 UMA_HISTOGRAM_TIMES("Settings.LoadDocumentTime.MD",
164 base::Time::Now() - load_start_time_); 168 base::Time::Now() - load_start_time_);
165 } 169 }
166 170
167 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() { 171 void MdSettingsUI::DocumentOnLoadCompletedInMainFrame() {
168 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD", 172 UMA_HISTOGRAM_TIMES("Settings.LoadCompletedTime.MD",
169 base::Time::Now() - load_start_time_); 173 base::Time::Now() - load_start_time_);
170 } 174 }
171 175
172 } // namespace settings 176 } // namespace settings
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698